Revert "Switch from version script to APEX stubs for libdexfile_external and add it to the Runtime APEX."
This reverts commit 23b2704ad1ac6cc40a31f491ea71f5d469e10a62.
Reason for revert: Breaks cf_x86_phone-userdebug: https://android-build.googleplex.com/builds/build-details/5273735/targets/cf_x86_phone-userdebug
Bug: 123700170
Bug: 113373927
Change-Id: I366212e879afea310b99562917b447c758ca8537
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 47a1e4b..4a6637b 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -13,12 +13,11 @@
]
// - Base requirements (libraries).
art_runtime_base_native_shared_libs = [
- "libadbconnection",
"libart",
"libart-compiler",
- "libdexfile_external",
"libopenjdkjvm",
"libopenjdkjvmti",
+ "libadbconnection",
]
bionic_native_shared_libs = [
"libc",
@@ -42,11 +41,11 @@
// - Debug variants (libraries).
art_runtime_debug_native_shared_libs = [
- "libadbconnectiond",
"libartd",
"libartd-compiler",
"libopenjdkjvmd",
"libopenjdkjvmtid",
+ "libadbconnectiond",
]
libcore_debug_native_shared_libs = [
"libopenjdkd",
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index a8b104f..1abc466 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -353,7 +353,6 @@
self._checker.check_library('libartpalette.so')
self._checker.check_no_library('libartpalette-system.so')
self._checker.check_library('libdexfile.so')
- self._checker.check_library('libdexfile_external.so')
self._checker.check_library('libopenjdkjvm.so')
self._checker.check_library('libopenjdkjvmti.so')
self._checker.check_library('libprofile.so')
diff --git a/build/apex/ld.config.txt b/build/apex/ld.config.txt
index 3cfda65..9bf2ae5 100644
--- a/build/apex/ld.config.txt
+++ b/build/apex/ld.config.txt
@@ -30,7 +30,6 @@
namespace.platform.asan.search.paths = /data/asan/system/${LIB}
namespace.platform.links = default
namespace.platform.link.default.shared_libs = libart.so:libartd.so
-namespace.platform.link.default.shared_libs += libdexfile_external.so
namespace.platform.link.default.shared_libs += libnativebridge.so
namespace.platform.link.default.shared_libs += libnativehelper.so
namespace.platform.link.default.shared_libs += libnativeloader.so