diff options
| author | Wink Saville <wink@google.com> | 2012-08-16 13:17:55 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2012-08-16 17:05:16 -0700 |
| commit | 127248594c6b24235aa233237d5cd27cb584d6d8 (patch) | |
| tree | 5676e8241cc2c798250e24990a9eaf2d438a7ff2 /gki | |
| parent | 815ccf47a118e907372223970cf44024e9689f43 (diff) | |
| download | external_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 'gki')
| -rw-r--r-- | gki/Android.mk | 8 | ||||
| -rw-r--r-- | gki/common/gki.h | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/gki/Android.mk b/gki/Android.mk index c8d8923..13a4a95 100644 --- a/gki/Android.mk +++ b/gki/Android.mk @@ -7,10 +7,10 @@ include $(CLEAR_VARS) LOCAL_C_INCLUDES:= $(LOCAL_PATH)/common \ $(LOCAL_PATH)/ulinux \ $(LOCAL_PATH)/../include \ - $(LOCAL_PATH)/../stack/include/ + $(LOCAL_PATH)/../stack/include \ + $(bdroid_C_INCLUDES) \ - -LOCAL_CFLAGS += -Werror +LOCAL_CFLAGS += -Werror $(bdroid_CFLAGS) ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true) LOCAL_CFLAGS += \ @@ -29,8 +29,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libcutils libc LOCAL_MODULE_CLASS := STATIC_LIBRARIES -include $(LOCAL_PATH)/../include/buildcfg.mk - include $(BUILD_STATIC_LIBRARY) endif # TARGET_SIMULATOR != true diff --git a/gki/common/gki.h b/gki/common/gki.h index a1005dc..d53ab04 100644 --- a/gki/common/gki.h +++ b/gki/common/gki.h @@ -12,9 +12,6 @@ #ifndef GKI_H #define GKI_H -#ifdef BUILDCFG -#include "buildcfg.h" -#endif /* Include platform-specific over-rides */ #if (defined(NFC_STANDALONE) && (NFC_STANDALONE == TRUE)) |