diff options
| author | Martin Stjernholm <mast@google.com> | 2018-12-19 00:09:41 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2018-12-19 00:11:04 +0000 |
| commit | cacf5bf6bca7e9806739a27589d8b6101c567c32 (patch) | |
| tree | 0dbf54f3f0647596c5dc00bca91c67a85aed35c7 /debuggerd | |
| parent | 8fd4435d532846b46fe47e52a6825a050d1af13c (diff) | |
| download | system_core-cacf5bf6bca7e9806739a27589d8b6101c567c32.tar.gz system_core-cacf5bf6bca7e9806739a27589d8b6101c567c32.tar.bz2 system_core-cacf5bf6bca7e9806739a27589d8b6101c567c32.zip | |
Revert "Use libdexfile external API in libunwindstack."
This reverts commit 444e23d2fc6d7c6f799ff9e2f69c1a82d2960c5b.
The rest of the topic doesn't need to be reverted.
Reason for revert: Breaks renderscript on marlin and sailfish.
Test: Manual repro of http://b/121110092#comment1 on reported branch
Test: "atest CtsRenderscriptTestCases" on that branch
Test: mmma system/core/{libunwindstack,libbacktrace}, run host gtests
Test: Make image, flash, and reboot device.
Bug: 121110092, 119632407
Change-Id: If1976b19ce386c95bc5bd4fd6d523745c167de18
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/Android.bp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index 516748176..d9fae5275 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -116,21 +116,14 @@ cc_library_static { "libdebuggerd", "libbacktrace", "libunwindstack", - "libdexfile", // libunwindstack dependency - "libdexfile_external", // libunwindstack dependency - "libdexfile_support", // libunwindstack dependency + "libdexfile", "liblzma", "libcutils", ], target: { recovery: { cflags: ["-DNO_LIBDEXFILE_SUPPORT"], - exclude_static_libs: [ - "libartbase", - "libdexfile", - "libdexfile_external", - "libdexfile_support", - ], + exclude_static_libs: ["libdexfile"], }, }, @@ -177,22 +170,12 @@ 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 { @@ -233,8 +216,6 @@ cc_test { static_libs: [ "libdebuggerd", - "libdexfile_external", // libunwindstack dependency - "libdexfile_support", // libunwindstack dependency "libunwindstack", ], |