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
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 89d4fc0..4e0470e 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -94,10 +94,7 @@
"DexFile.cpp",
"DexFiles.cpp",
],
- exclude_shared_libs: [
- "libdexfile_external",
- "libdexfile_support",
- ],
+ exclude_shared_libs: ["libdexfile"],
},
recovery: {
cflags: ["-DNO_LIBDEXFILE_SUPPORT"],
@@ -105,10 +102,7 @@
"DexFile.cpp",
"DexFiles.cpp",
],
- exclude_shared_libs: [
- "libdexfile_external",
- "libdexfile_support",
- ],
+ exclude_shared_libs: ["libdexfile"],
},
},
@@ -133,8 +127,7 @@
shared_libs: [
"libbase",
- "libdexfile_external",
- "libdexfile_support",
+ "libdexfile",
"liblog",
"liblzma",
],
@@ -222,7 +215,6 @@
"liblzma",
"libunwindstack",
"libdexfile",
- "libdexfile_support",
],
static_libs: [