diff options
| author | Martin Stjernholm <mast@google.com> | 2018-12-19 14:28:33 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2018-12-19 21:04:35 +0000 |
| commit | bb4f2b440a5c970a3a522e94d69dae5fbaea81c6 (patch) | |
| tree | 0792f75b20c1a2cfd8edc400b4ca7e8be0cf47bf /debuggerd | |
| parent | 1baa19b1a6bec9c0b1b067eef378646c62d9bf1b (diff) | |
| download | system_core-bb4f2b440a5c970a3a522e94d69dae5fbaea81c6.tar.gz system_core-bb4f2b440a5c970a3a522e94d69dae5fbaea81c6.tar.bz2 system_core-bb4f2b440a5c970a3a522e94d69dae5fbaea81c6.zip | |
Revert^2 "Use libdexfile external API in libunwindstack."
This reverts commit cacf5bf6bca7e9806739a27589d8b6101c567c32.
Reason for revert: Re-apply with proper fix for VNDK visibility on marlin and sailfish.
Test: Manual repro of http://b/121110092#comment1 on reported branch
Test: atest CtsRenderscriptTestCases
Test: mmma system/core/{libunwindstack,libbacktrace}, run host gtests
Test: Make image, flash, and reboot device.
Test: Forrest cts/art/gce-all: https://android-build.googleplex.com/builds/forrest/run/L00300000240828791
Test: Forrest cts/bionic/gce-all: https://android-build.googleplex.com/builds/forrest/run/L05600000240682947 (shows 27/2958 failed, but it doesn't pass on Blackbox either: http://screen/xbjioEf6UgR)
Test: Forrest cts/renderscript/gce-all: https://android-build.googleplex.com/builds/forrest/run/L66200000240680523
Bug: 119632407
Change-Id: I601aa97eac8127e30d753405f8bc1fc4ae7f849f
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", ], |