From 6e12f443720a668c72d308ad6bde3146184a4124 Mon Sep 17 00:00:00 2001
From: Heather Lee Wilson <hwilson@google.com>
Date: Wed, 28 May 2014 13:34:55 -0700
Subject: [PATCH] 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
---
 hci/Android.mk              | 7 +++++--
 hci/include/bt_hci_bdroid.h | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

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
 ******************************************************************************/
-- 
2.11.0