summaryrefslogtreecommitdiffstats
path: root/hci
diff options
context:
space:
mode:
authorThomas Wendt <thoemy@gmx.net>2013-03-08 02:41:34 +0100
committerThomas Wendt <thoemy@gmx.net>2013-03-08 02:41:34 +0100
commitb7f44f86839bbf77a3d885125a13b6c7fea7e7b0 (patch)
treee49812b14f00c2770a8fefe8a9799dcfd0b59db9 /hci
parentce6c2405a9272656285019754fd4d4ac223b92bd (diff)
downloadexternal_bluetooth_bluedroid-b7f44f86839bbf77a3d885125a13b6c7fea7e7b0.zip
external_bluetooth_bluedroid-b7f44f86839bbf77a3d885125a13b6c7fea7e7b0.tar.gz
external_bluetooth_bluedroid-b7f44f86839bbf77a3d885125a13b6c7fea7e7b0.tar.bz2
libbt-hci: include bdroid_buildcfg.h from device repo
This lets device repos override some constants with their bdroid_buildcfg.h if necessary. This fixes Bluetooth issues (namely tethering) on endeavoru where BTHC_USERIAL_READ_MEM_SIZE needs to be set to a higher value. Change-Id: I8955963cdb2b34f1ba63f8160861699f7284814f
Diffstat (limited to 'hci')
-rw-r--r--hci/Android.mk7
-rw-r--r--hci/include/bt_hci_bdroid.h5
2 files changed, 10 insertions, 2 deletions
diff --git a/hci/Android.mk b/hci/Android.mk
index f2a63e5..b0dc4aa 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 5681e85..c97bd9e 100644
--- a/hci/include/bt_hci_bdroid.h
+++ b/hci/include/bt_hci_bdroid.h
@@ -32,6 +32,11 @@
#include "bt_hci_lib.h"
+#ifdef HAS_BDROID_BUILDCFG
+#include "bdroid_buildcfg.h"
+#endif
+
+
/******************************************************************************
** Constants & Macros
******************************************************************************/