Merge e5596a07c8dec6824f8b3a37f2aed87f384725a2 on remote branch

Change-Id: If12e2180faff961e7b3e480f45dfbb81900e463e

Android.mk

@@ -3,7 +3,7 @@
 LOCAL_PATH := $(call my-dir)
 
 # Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,taro kalama pineapple blair pitti volcano), true)
+ifeq ($(call is-board-platform-in-list,taro kalama pineapple blair pitti volcano niobe), true)
 
 BT_SELECT := CONFIG_MSM_BT_POWER=m
 #ifdef CONFIG_SLIMBUS

bt_kernel_product_board.mk

@@ -1,6 +1,4 @@
 # Build BT kernel drivers
-ifneq ($(TARGET_BOARD_PLATFORM), niobe)
 PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/btpower.ko\
 	$(KERNEL_MODULES_OUT)/bt_fm_slim.ko \
 	$(KERNEL_MODULES_OUT)/radio-i2c-rtc6226-qca.ko
-endif

bt_kernel_vendor_board.mk

@@ -11,12 +11,10 @@ ifeq ($(TARGET_USES_QMAA),true)
   endif
 else
   ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
-     ifneq ($(TARGET_BOARD_PLATFORM), niobe)
         BT_KERNEL_DRIVER := $(KERNEL_MODULES_OUT)/btpower.ko\
             $(KERNEL_MODULES_OUT)/bt_fm_slim.ko \
             $(KERNEL_MODULES_OUT)/radio-i2c-rtc6226-qca.ko
         BOARD_VENDOR_KERNEL_MODULES += $(BT_KERNEL_DRIVER)
-     endif
   endif
 endif
 endif

target.bzl

@@ -49,3 +49,19 @@ def define_pitti():
 	    "CONFIG_BT_HW_SECURE_DISABLE",
 	]
    )
+
+def define_niobe():
+    define_bt_modules(
+	target = "niobe",
+	modules = [
+	    "btpower",
+	    "bt_fm_slim",
+	    "radio-i2c-rtc6226-qca",
+	],
+	config_options = [
+	    "CONFIG_MSM_BT_POWER",
+	    "CONFIG_BTFM_SLIM",
+	    "CONFIG_I2C_RTC6226_QCA",
+	    "CONFIG_BT_HW_SECURE_DISABLE",
+	]
+   )