From: Heather Lee Wilson <hwilson@google.com>
Date: Wed, 28 May 2014 20:34:55 +0000 (-0700)
Subject: include bdroid_buildcfg.h from device repo
X-Git-Tag: android-x86-7.1-r1~1281^2~54^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e12f443;p=android-x86%2Fsystem-bt.git

include bdroid_buildcfg.h from device repo

Fixes Bluetooth tethering issues where BTHC_USERIAL_READ_MEM_SIZE needs to be
set to a higher value.

Change-Id: Ia8db682aadee3ccff8aba1ce27e18a093a78db9c
---

diff --git a/hci/Android.mk b/hci/Android.mk
index 2b1b07e03..24fec19c3 100644
--- a/hci/Android.mk
+++ b/hci/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+LOCAL_CFLAGS += $(bdroid_CFLAGS)
+
 LOCAL_SRC_FILES := \
         src/bt_hci_bdroid.c \
         src/lpm.c \
@@ -11,7 +13,7 @@ LOCAL_SRC_FILES := \
 
 ifeq ($(BLUETOOTH_HCI_USE_MCT),true)
 
-LOCAL_CFLAGS := -DHCI_USE_MCT
+LOCAL_CFLAGS += -DHCI_USE_MCT
 
 LOCAL_SRC_FILES += \
         src/hci_mct.c \
@@ -27,7 +29,8 @@ endif
 
 LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/include \
-        $(LOCAL_PATH)/../utils/include
+        $(LOCAL_PATH)/../utils/include \
+        $(bdroid_C_INCLUDES)
 
 LOCAL_SHARED_LIBRARIES := \
         libcutils \
diff --git a/hci/include/bt_hci_bdroid.h b/hci/include/bt_hci_bdroid.h
index 7b2385100..904c698cc 100644
--- a/hci/include/bt_hci_bdroid.h
+++ b/hci/include/bt_hci_bdroid.h
@@ -32,6 +32,10 @@
 
 #include "bt_hci_lib.h"
 
+#ifdef HAS_BDROID_BUILDCFG
+#include "bdroid_buildcfg.h"
+#endif
+
 /******************************************************************************
 **  Constants & Macros
 ******************************************************************************/