5 files changed, 11 insertions, 17 deletions
diff --git a/bt-commonsys-intf-board.mk b/bt-commonsys-intf-board.mk
index 89eb7d2..911b0f0 100644
--- a/bt-commonsys-intf-board.mk
+++ b/bt-commonsys-intf-board.mk
@@ -6,13 +6,7 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_QCOM := true
 
 #FM
-ifeq ($(TARGET_BOARD_TYPE),auto)
-BOARD_HAVE_QCOM_FM := false
-else ifeq ($(TARGET_BOARD_AUTO),true)
-BOARD_HAVE_QCOM_FM := false
-else
-BOARD_HAVE_QCOM_FM := true
-endif
+BOARD_HAVE_QCOM_FM ?= false
 
 TARGET_USE_QTI_BT_CONFIGSTORE := true
 TARGET_USE_QTI_BT_SAR := true
diff --git a/bt-commonsys-intf-legacy-aosp-board.mk b/bt-commonsys-intf-legacy-aosp-board.mk
index ddd2607..0d2dfa4 100644
--- a/bt-commonsys-intf-legacy-aosp-board.mk
+++ b/bt-commonsys-intf-legacy-aosp-board.mk
@@ -3,7 +3,7 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_QCOM := true
 
 #FM
-BOARD_HAVE_QCOM_FM := false
+BOARD_HAVE_QCOM_FM ?= false
 
 TARGET_USE_QTI_BT_CONFIGSTORE := false
 TARGET_USE_QTI_BT_SAR := false
diff --git a/bt-commonsys-intf-legacy-board.mk b/bt-commonsys-intf-legacy-board.mk
index 14b2a44..175d0f3 100644
--- a/bt-commonsys-intf-legacy-board.mk
+++ b/bt-commonsys-intf-legacy-board.mk
@@ -3,7 +3,7 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_QCOM := true
 
 #FM
-BOARD_HAVE_QCOM_FM := true
+BOARD_HAVE_QCOM_FM ?= false
 
 ifneq ($(filter sdm660 msm8998, $(TARGET_BOARD_PLATFORM)),)
 BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
diff --git a/bt-system-opensource-product.mk b/bt-system-opensource-product.mk
index f82a67a..08036ad 100644
--- a/bt-system-opensource-product.mk
+++ b/bt-system-opensource-product.mk
@@ -16,7 +16,7 @@ PRODUCT_PACKAGES += Bluetooth
 
 ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS), true)
 ifneq ($(TARGET_BOARD_TYPE),auto)
-TARGET_USE_QTI_BT_STACK := true
+TARGET_USE_QTI_BT_STACK ?= true
 endif
 
 ifeq ($(TARGET_USE_QTI_BT_STACK),true)
@@ -44,14 +44,14 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/qcom/opensource/commonsys-intf/bluetooth/over
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := vendor/qcom/opensource/commonsys-intf/bluetooth/build/qva/config
 
 # BT Related Test app & Tools
-PRODUCT_PACKAGES_DEBUG += btsnoop
-PRODUCT_PACKAGES_DEBUG += gatt_tool_qti_internal
-PRODUCT_PACKAGES_DEBUG += l2cap_coc_tool
-PRODUCT_PACKAGES_DEBUG += l2test_ertm
-PRODUCT_PACKAGES_DEBUG += rfc
+PRODUCT_PACKAGES_ENG += btsnoop
+PRODUCT_PACKAGES_ENG += gatt_tool_qti_internal
+PRODUCT_PACKAGES_ENG += l2cap_coc_tool
+PRODUCT_PACKAGES_ENG += l2test_ertm
+PRODUCT_PACKAGES_ENG += rfc
 
 ifneq ($(TARGET_HAS_LOW_RAM), true)
-PRODUCT_PACKAGES_DEBUG += BTTestApp
+PRODUCT_PACKAGES_ENG += BTTestApp
 endif #TARGET_HAS_LOW_RAM
 
 else
diff --git a/build/qva/config/bdroid_buildcfg.h b/build/qva/config/bdroid_buildcfg.h
index 6c7d51e..fb2ac69 100644
--- a/build/qva/config/bdroid_buildcfg.h
+++ b/build/qva/config/bdroid_buildcfg.h
@@ -19,7 +19,7 @@
 
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
-#define BTM_DEF_LOCAL_NAME   "QCOM-BTD"
+//#define BTM_DEF_LOCAL_NAME   "QCOM-BTD"
 // Disables read remote device feature
 #define MAX_ACL_CONNECTIONS   16
 #define MAX_L2CAP_CHANNELS    32