diff options
| author | Martin Stjernholm <mast@google.com> | 2018-11-15 18:08:06 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2018-12-13 17:58:23 +0000 |
| commit | 444e23d2fc6d7c6f799ff9e2f69c1a82d2960c5b (patch) | |
| tree | 259892bf4c90f2281bc7883352ff89f0ed4b148e /debuggerd | |
| parent | 8f3ed624226941740ee0a818096dbda095badae8 (diff) | |
| download | system_core-444e23d2fc6d7c6f799ff9e2f69c1a82d2960c5b.tar.gz system_core-444e23d2fc6d7c6f799ff9e2f69c1a82d2960c5b.tar.bz2 system_core-444e23d2fc6d7c6f799ff9e2f69c1a82d2960c5b.zip | |
Use libdexfile external API in libunwindstack.
Test: mmma system/core/{libunwindstack,libbacktrace}, run host gtests
Test: Make image, flash, and reboot device.
Bug: 119632407
Change-Id: I370f089a1b20ba432e136818b4325d46f99df708
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/Android.bp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index d9fae5275..516748176 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -116,14 +116,21 @@ cc_library_static { "libdebuggerd", "libbacktrace", "libunwindstack", - "libdexfile", + "libdexfile", // libunwindstack dependency + "libdexfile_external", // libunwindstack dependency + "libdexfile_support", // libunwindstack dependency "liblzma", "libcutils", ], target: { recovery: { cflags: ["-DNO_LIBDEXFILE_SUPPORT"], - exclude_static_libs: ["libdexfile"], + exclude_static_libs: [ + "libartbase", + "libdexfile", + "libdexfile_external", + "libdexfile_support", + ], }, }, @@ -170,12 +177,22 @@ cc_library_static { static_libs: [ "libbacktrace", + "libdexfile_external", // libunwindstack dependency + "libdexfile_support", // libunwindstack dependency "libunwindstack", "liblzma", "libbase", "libcutils", "liblog", ], + target: { + recovery: { + exclude_static_libs: [ + "libdexfile_external", + "libdexfile_support", + ], + }, + }, } cc_test { @@ -216,6 +233,8 @@ cc_test { static_libs: [ "libdebuggerd", + "libdexfile_external", // libunwindstack dependency + "libdexfile_support", // libunwindstack dependency "libunwindstack", ], |