diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2015-06-11 02:09:01 -0700 |
|---|---|---|
| committer | Pavlin Radoslavov <pavlin@google.com> | 2015-06-11 14:00:31 -0700 |
| commit | 74626115db17478a12d1d39bcefd5af500fadfda (patch) | |
| tree | d5047b9d39a35cecd21d38fe4893ccf5c92d7db3 /main | |
| parent | af753a253bb3e40f11be33d2c70368adc205cca6 (diff) | |
| download | android_system_bt-74626115db17478a12d1d39bcefd5af500fadfda.tar.gz android_system_bt-74626115db17478a12d1d39bcefd5af500fadfda.tar.bz2 android_system_bt-74626115db17478a12d1d39bcefd5af500fadfda.zip | |
Re-enable the OSI memory allocation tracker.
Previously, the OSI memory allocation tracker was disabled as
a temporary workaround for Bug 21561735.
The root cause for the original issue is now addressed by using the
appropriate linker flags when generating the bluetooth.default.so
shared library:
LOCAL_LDLIBS := -Wl,-Bsymbolic,-Bsymbolic-functions
Also, added missing #include in file "btif/src/btif_sock_sco.c"
Bug: 21561735
Change-Id: I384a6f3d1d03c74f8d1e3c96bf7e0b5961206feb
Diffstat (limited to 'main')
| -rw-r--r-- | main/Android.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/main/Android.mk b/main/Android.mk index 04d43329a..ff7b4a503 100644 --- a/main/Android.mk +++ b/main/Android.mk @@ -151,6 +151,16 @@ LOCAL_MODULE := bluetooth.default LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := SHARED_LIBRARIES + +# +# Shared library link options. +# References to global symbols and functions should bind to the library +# itself. This is to avoid issues with some of the unit/system tests +# that might link statically with some of the code in the library, and +# also dlopen(3) the shared library. +# +LOCAL_LDLIBS := -Wl,-Bsymbolic,-Bsymbolic-functions + LOCAL_REQUIRED_MODULES := \ auto_pair_devlist.conf \ bt_did.conf \ |