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 /stack | |
| 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 'stack')
| -rw-r--r-- | stack/Android.mk | 7 | ||||
| -rw-r--r-- | stack/btm/btm_inq.c | 4 | ||||
| -rw-r--r-- | stack/include/dyn_mem.h | 10 |
3 files changed, 11 insertions, 10 deletions
diff --git a/stack/Android.mk b/stack/Android.mk index d2ccaff..f209fb7 100644 --- a/stack/Android.mk +++ b/stack/Android.mk @@ -27,7 +27,10 @@ LOCAL_C_INCLUDES:= . \ $(LOCAL_PATH)/../ctrlr/include \ $(LOCAL_PATH)/../bta/include \ $(LOCAL_PATH)/../bta/sys \ - $(LOCAL_PATH)/../brcm/include + $(LOCAL_PATH)/../brcm/include \ + $(bdroid_C_INCLUDES) \ + +LOCAL_CFLAGS += $(bdroid_CFLAGS) ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true) LOCAL_CFLAGS += \ @@ -132,8 +135,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_SHARED_LIBRARIES := libcutils libc -include $(LOCAL_PATH)/../include/buildcfg.mk - include $(BUILD_STATIC_LIBRARY) endif # TARGET_SIMULATOR != true diff --git a/stack/btm/btm_inq.c b/stack/btm/btm_inq.c index a67f723..2339150 100644 --- a/stack/btm/btm_inq.c +++ b/stack/btm/btm_inq.c @@ -116,8 +116,8 @@ const UINT16 BTM_EIR_UUID_LKUP_TBL[BTM_EIR_MAX_SERVICES] = }; #else /* -If customized UUID look-up table needs to be used, -the followings should be defined in buildcfg.h. +If customized UUID look-up table needs to be used, +the followings should be defined in bdroid_buildcfg.h. BTM_EIR_UUID_LKUP_TBL = <customized UUID list> BTM_EIR_MAX_SERVICES = <number of UUID in list> */ diff --git a/stack/include/dyn_mem.h b/stack/include/dyn_mem.h index 58d4579..c243fe8 100644 --- a/stack/include/dyn_mem.h +++ b/stack/include/dyn_mem.h @@ -14,7 +14,7 @@ #define DYN_MEM_H /**************************************************************************** -** Define memory usage for GKI (if not defined in buildcfg.h) +** Define memory usage for GKI (if not defined in bdroid_buildcfg.h) ** The default for GKI is to use static memory allocation for its control ** block. */ @@ -23,7 +23,7 @@ #endif /**************************************************************************** -** Define memory usage for each CORE component (if not defined in buildcfg.h) +** Define memory usage for each CORE component (if not defined in bdroid_buildcfg.h) ** The default for each component is to use static memory allocations. */ #ifndef BTU_DYNAMIC_MEMORY @@ -79,7 +79,7 @@ #endif /**************************************************************************** -** Define memory usage for each PROFILE component (if not defined in buildcfg.h) +** Define memory usage for each PROFILE component (if not defined in bdroid_buildcfg.h) ** The default for each component is to use static memory allocations. */ #ifndef A2D_DYNAMIC_MEMORY @@ -163,7 +163,7 @@ #endif /**************************************************************************** -** Define memory usage for BTA (if not defined in buildcfg.h) +** Define memory usage for BTA (if not defined in bdroid_buildcfg.h) ** The default for each component is to use static memory allocations. */ #ifndef BTA_DYNAMIC_MEMORY @@ -171,7 +171,7 @@ #endif /**************************************************************************** -** Define memory usage for BT Trace (if not defined in buildcfg.h) +** Define memory usage for BT Trace (if not defined in bdroid_buildcfg.h) ** The default is to use static memory allocations. */ #ifndef BTTRC_DYNAMIC_MEMORY |