diff options
| author | Martin Stjernholm <mast@google.com> | 2019-02-05 04:59:07 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2019-02-12 22:03:48 +0000 |
| commit | e31cfb609d1be26c6051ff6aae5bab3616222a41 (patch) | |
| tree | 7d1fbac74a996ded35a26b46fdf42327a10986ba /debuggerd | |
| parent | 1d7966bd462462224e4c0f9cb260eb5871a02dc8 (diff) | |
| download | system_core-e31cfb609d1be26c6051ff6aae5bab3616222a41.tar.gz system_core-e31cfb609d1be26c6051ff6aae5bab3616222a41.tar.bz2 system_core-e31cfb609d1be26c6051ff6aae5bab3616222a41.zip | |
Use new static target for libdexfile_support.
This is necessary since the dynamic one is now using dlopen(), which isn't
available in static builds.
Test: m
Test: mmma system/core/{libunwindstack,libbacktrace}, run host gtests (cannot get atest to work)
Bug: 123403798
Bug: 123186083
Change-Id: I06a9cdfe7e7cc01427ffd54b66c8ebab88782260
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/Android.bp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index 4a53a3305..76c5adeec 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -115,19 +115,14 @@ cc_library_static { "libbase", "libdebuggerd", "libunwindstack", - "libdexfile", // libunwindstack dependency - "libdexfile_external", // libunwindstack dependency - "libdexfile_support", // libunwindstack dependency + "libdexfile_support_static", // libunwindstack dependency "liblzma", "libcutils", ], target: { recovery: { exclude_static_libs: [ - "libartbase", - "libdexfile", - "libdexfile_external", - "libdexfile_support", + "libdexfile_support_static", ], }, }, @@ -174,8 +169,7 @@ cc_library_static { include_dirs: ["bionic/libc"], static_libs: [ - "libdexfile_external", // libunwindstack dependency - "libdexfile_support", // libunwindstack dependency + "libdexfile_support_static", // libunwindstack dependency "libunwindstack", "liblzma", "libbase", @@ -185,8 +179,7 @@ cc_library_static { target: { recovery: { exclude_static_libs: [ - "libdexfile_external", - "libdexfile_support", + "libdexfile_support_static", ], }, }, |