commit a6de8f8e6e9f51fc75366a70beec957a5d79a2a8
author Thierry Strudel <tstrudel@google.com> Fri Sep 16 06:07:22 2016 -0700
committer Thierry Strudel <tstrudel@google.com> Fri Sep 16 18:10:12 2016 +0000
tree 78939e70fdeb5ce54bcb7df4c52d9d64657fcbf4
parent 0ebd0bab066cd86d7a19f4646e0686dae885004e

msmcobalt: add to build + fix FM_OVER_UART selection

Bug: 31420007
Change-Id: I43f44ef5ea134f648f4739c632c93e7d9252f8e5
Signed-off-by: Thierry Strudel <tstrudel@google.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 3f778ac..2b92f63 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,10 @@
         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

msmcobalt/libbt-vendor/Android.mk

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 @@
         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