Merge pull request #12 from tdz/bug-1207480

Bug 1207480: Include B2G Bluedroid configuration from libhardware_moz. r=shuang
mozilla-b2g · Oct 21, 2015 · 9d4b787 · 9d4b787
2 parents a256393 + b7419ca
commit 9d4b787
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -85,10 +85,13 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 # BT definitions for Qualcomm solution
 BLUETOOTH_HCI_USE_MCT := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/sony/yukon/bluetooth
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_QCOM := true
 
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := \
+  device/sony/yukon/bluetooth \
+  hardware/libhardware_moz/include/hardware_moz/bluetooth/bluedroid
+
 # GPS definitions for Qualcomm solution
 BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := $(TARGET_BOARD_PLATFORM)
 TARGET_NO_RPC := true

diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
@@ -17,6 +17,9 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
+/* B2G common configuration. */
+#include "b2g_bdroid_buildcfg.h"
+
 #define BTA_HOST_INTERLEAVE_SEARCH  TRUE
 
 #endif