diff options
| author | Chris Manton <cmanton@google.com> | 2014-05-07 16:21:00 -0700 |
|---|---|---|
| committer | Chris Manton <cmanton@google.com> | 2014-06-09 23:08:58 +0000 |
| commit | e01b1126c734fa9f0decc94eaebf06d10501d624 (patch) | |
| tree | 9fcb9be0b0187c41a30529c4255de65994652464 /utils | |
| parent | 82d0a118de082b95cc41b63de8fcd79c9f1f0831 (diff) | |
| download | android_system_bt-e01b1126c734fa9f0decc94eaebf06d10501d624.tar.gz android_system_bt-e01b1126c734fa9f0decc94eaebf06d10501d624.tar.bz2 android_system_bt-e01b1126c734fa9f0decc94eaebf06d10501d624.zip | |
Re-layout Android.mk for single shared library
Shared object libraries require complete symbol resolution
while archives do not. The hci, btutil and a2dp hbtutil were
built as shared, but used the other archive libraries (e.g. gki).
To resolve all symbols in each of the so's, they stubbed out
data interfaces to the common structures.
(e.g. hci/include/utils.h)
This will unify all libraries and eliminate multiple definitions
of the same structure.
Change-Id: I2af9a3e8a87888cd007aaf0809cdfc09039cd460
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Android.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/utils/Android.mk b/utils/Android.mk index d0327e96f..fb337bb42 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -1,20 +1,20 @@ -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_C_INCLUDES:= $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../gki/ulinux \ - $(bdroid_C_INCLUDES) +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/../gki/ulinux \ + $(bdroid_C_INCLUDES) LOCAL_CFLAGS += $(bdroid_CFLAGS) -std=c99 -LOCAL_PRELINK_MODULE:=false -LOCAL_SRC_FILES:= \ - ./src/bt_utils.c +LOCAL_PRELINK_MODULE :=false +LOCAL_SRC_FILES := \ + ./src/bt_utils.c LOCAL_MODULE := libbt-utils LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := libcutils liblog libc -LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_CLASS := STATIC_LIBRARIES -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) |