Merge "BT: Remove deprecated LOCAL_MODULE_TAGS := eng debug" into bt.lnx.5.0
diff --git a/BATestApp/Android.mk b/BATestApp/Android.mk
index bc1f5d1..ba23089 100644
--- a/BATestApp/Android.mk
+++ b/BATestApp/Android.mk
@@ -2,7 +2,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := debug
LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res
diff --git a/certification_tools/blegatt_test/Android.mk b/certification_tools/blegatt_test/Android.mk
index 9c0d1a4..afb9a8c 100644
--- a/certification_tools/blegatt_test/Android.mk
+++ b/certification_tools/blegatt_test/Android.mk
@@ -20,7 +20,6 @@
LOCAL_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug optional
LOCAL_MODULE:= gatt_tool_qti_internal
diff --git a/certification_tools/l2test_ertm/Android.mk b/certification_tools/l2test_ertm/Android.mk
index 75f15ff..2adbb4f 100644
--- a/certification_tools/l2test_ertm/Android.mk
+++ b/certification_tools/l2test_ertm/Android.mk
@@ -19,7 +19,6 @@
LOCAL_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug optional
LOCAL_MODULE:= l2test_ertm
LOCAL_SHARED_LIBRARIES += libcutils \
diff --git a/certification_tools/mcap_tool/Android.mk.disabled b/certification_tools/mcap_tool/Android.mk.disabled
index de77168..93b8326 100644
--- a/certification_tools/mcap_tool/Android.mk.disabled
+++ b/certification_tools/mcap_tool/Android.mk.disabled
@@ -19,7 +19,6 @@
LOCAL_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug optional
LOCAL_MODULE:= mcap_tool_qti_internal
diff --git a/certification_tools/rfcommtest/Android.mk b/certification_tools/rfcommtest/Android.mk
index a42dacd..ddd9197 100644
--- a/certification_tools/rfcommtest/Android.mk
+++ b/certification_tools/rfcommtest/Android.mk
@@ -19,7 +19,6 @@
LOCAL_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug optional
LOCAL_MODULE:= rfc
LOCAL_SHARED_LIBRARIES += libcutils \