diff options
| author | Zach Johnson <zachoverflow@google.com> | 2015-05-19 14:49:37 -0700 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-05-19 22:11:32 +0000 |
| commit | 0ef6b347b8cf1a9e83e6b680a0ee025da24f00b6 (patch) | |
| tree | 052cb28b29b02117e5f91fcfa4b66e0c515c5279 /main | |
| parent | 7bd4038ea9a2f1953dc98fa67aec413b6247c584 (diff) | |
| download | android_system_bt-0ef6b347b8cf1a9e83e6b680a0ee025da24f00b6.tar.gz android_system_bt-0ef6b347b8cf1a9e83e6b680a0ee025da24f00b6.tar.bz2 android_system_bt-0ef6b347b8cf1a9e83e6b680a0ee025da24f00b6.zip | |
Build the shared library with --whole-archive
For stack static libraries, use LOCAL_WHOLE_STATIC_LIBRARIES
to ensure they get --whole-archive applied to them.
This means module symbols in static libraries won't be
removed by the linker and dlsym will find them.
This patch also removes the code hacks we needed to
trick the linker into including the module symbols in
the final shared library.
Change-Id: I2463d0e6fb38f1e75c8293179cf9d4ca33eda84e
Diffstat (limited to 'main')
| -rw-r--r-- | main/Android.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/main/Android.mk b/main/Android.mk index d5cf8dd36..04d43329a 100644 --- a/main/Android.mk +++ b/main/Android.mk @@ -134,6 +134,10 @@ LOCAL_SHARED_LIBRARIES := \ libz LOCAL_STATIC_LIBRARIES := \ + libtinyxml2 \ + libbt-qcom_sbc_decoder + +LOCAL_WHOLE_STATIC_LIBRARIES := \ libbt-brcm_bta \ libbt-brcm_gki \ libbt-brcm_stack \ @@ -141,9 +145,7 @@ LOCAL_STATIC_LIBRARIES := \ libbt-hci \ libbt-utils \ libbtcore \ - libosi \ - libtinyxml2 \ - libbt-qcom_sbc_decoder + libosi LOCAL_MODULE := bluetooth.default LOCAL_MODULE_RELATIVE_PATH := hw |