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