summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Strudel <tstrudel@google.com>2016-09-16 06:07:22 -0700
committerThierry Strudel <tstrudel@google.com>2016-09-16 18:10:12 +0000
commita6de8f8e6e9f51fc75366a70beec957a5d79a2a8 (patch)
tree78939e70fdeb5ce54bcb7df4c52d9d64657fcbf4
parent0ebd0bab066cd86d7a19f4646e0686dae885004e (diff)
downloadbt-a6de8f8e6e9f51fc75366a70beec957a5d79a2a8.tar.gz
msmcobalt: add to build + fix FM_OVER_UART selection
Bug: 31420007 Change-Id: I43f44ef5ea134f648f4739c632c93e7d9252f8e5 Signed-off-by: Thierry Strudel <tstrudel@google.com>
-rw-r--r--Android.mk4
-rw-r--r--msmcobalt/libbt-vendor/Android.mk2
2 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 3f778ac..2b92f63 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,10 @@ ifneq ($(TARGET_BOARD_AUTO),true)
ifneq ($(filter msm8909 ,$(TARGET_BOARD_PLATFORM)),)
#For msm8909 target
include $(call all-named-subdir-makefiles,msm8909)
+ else
+ ifneq ($(filter msmcobalt,$(TARGET_BOARD_PLATFORM)),)
+ include $(call all-named-subdir-makefiles,msmcobalt)
+ endif
endif
endif
endif
diff --git a/msmcobalt/libbt-vendor/Android.mk b/msmcobalt/libbt-vendor/Android.mk
index 3b1ac18..27f8c4d 100644
--- a/msmcobalt/libbt-vendor/Android.mk
+++ b/msmcobalt/libbt-vendor/Android.mk
@@ -31,7 +31,9 @@ LOCAL_SRC_FILES := \
src/bt_vendor_persist.cpp
#Disable this flag in case if FM over UART support not needed
+ifeq ($(QCOM_BT_FM_OVER_UART),true)
LOCAL_CFLAGS := -DFM_OVER_UART
+endif
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
LOCAL_CFLAGS += -DPANIC_ON_SOC_CRASH