Merge pull request #105 from tdz/bug-1207480

Bug 1207480 - include Bluedroid configuration from libhardware_moz. r=shuang

BoardConfig.mk

@@ -1,8 +1,5 @@
 include device/qcom/msm8610/BoardConfig.mk
 
-# Use default Gecko location if it's not provided in config files.
-GECKO_PATH ?= gecko
-
 TARGET_USES_TCT_FOTA := false
 TARGET_RECOVERY_FSTAB := device/t2m/flame/recovery.fstab
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
@@ -27,8 +24,10 @@ BOARD_USE_QCOM_LLVM_CLANG_RS := true
 
 BOARD_HAVE_BLUETOOTH := true
 BOARD_BLUETOOTH_DOES_NOT_USE_RFKILL := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/t2m/flame/bluetooth \
-                                               $(GECKO_PATH)/dom/bluetooth/bluedroid
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := \
+  device/t2m/flame/bluetooth \
+  hardware/libhardware_moz/include/hardware_moz/bluetooth/bluedroid
+
 BOARD_HAS_QCOM_WLAN := true
 BOARD_HAS_ATH_WLAN_AR6004 := true
 BOARD_WLAN_DEVICE := qcwcn