summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-08-16 13:17:55 -0700
committerWink Saville <wink@google.com>2012-08-16 17:05:16 -0700
commit127248594c6b24235aa233237d5cd27cb584d6d8 (patch)
tree5676e8241cc2c798250e24990a9eaf2d438a7ff2 /main
parent815ccf47a118e907372223970cf44024e9689f43 (diff)
downloadexternal_bluetooth_bluedroid-127248594c6b24235aa233237d5cd27cb584d6d8.zip
external_bluetooth_bluedroid-127248594c6b24235aa233237d5cd27cb584d6d8.tar.gz
external_bluetooth_bluedroid-127248594c6b24235aa233237d5cd27cb584d6d8.tar.bz2
Add support for per device bluetooth configuration.
Rather than using a text file and generating each buildcfg.h file per device bdroid_buildcfg.h which supplies device specific values and then bt_target.h will supply common values. Change-Id: I12cb5408729c3e076562a292204f07a0c4b52628
Diffstat (limited to 'main')
-rwxr-xr-xmain/Android.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/main/Android.mk b/main/Android.mk
index 41cac93..1f1d60c 100755
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -86,9 +86,10 @@ LOCAL_C_INCLUDES+= . \
$(LOCAL_PATH)/../hci/include\
$(LOCAL_PATH)/../brcm/include \
$(LOCAL_PATH)/../embdrv/sbc/encoder/include \
- $(LOCAL_PATH)/../audio_a2dp_hw
+ $(LOCAL_PATH)/../audio_a2dp_hw \
+ $(bdroid_C_INCLUDES) \
-LOCAL_CFLAGS += -DBUILDCFG -Werror -Wno-error=maybe-uninitialized -Wno-error=uninitialized
+LOCAL_CFLAGS += -DBUILDCFG $(bdroid_CFLAGS) -Werror -Wno-error=maybe-uninitialized -Wno-error=uninitialized
ifeq ($(TARGET_PRODUCT), full_crespo)
LOCAL_CFLAGS += -DTARGET_CRESPO
@@ -121,6 +122,4 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_REQUIRED_MODULES := libbt-hci libbt-vendor bt_stack.conf bt_did.conf auto_pair_devlist.conf
-include $(LOCAL_PATH)/../include/buildcfg.mk
-
include $(BUILD_SHARED_LIBRARY)