Remove libdexfile_support shared library.
It's a tiny library that doesn't justify the DSO overhead - only
provide it as a static library.
Also clean up a few remaining references to libdexfile_external.so.
Cherry-picked from https://r.android.com/1708390.
Test: Boot
Bug: 143978909
Change-Id: I3d2be11e7b01dcfeafffab518833ca7425e95f4c
Merged-In: I3d2be11e7b01dcfeafffab518833ca7425e95f4c
diff --git a/Android.mk b/Android.mk
index 4889d34..09cf3f2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -522,8 +522,6 @@
lib/libartpalette.so \
lib/libart.so \
lib/libbacktrace.so \
- lib/libdexfile_external.so \
- lib/libdexfile_support.so \
lib/libdexfile.so \
lib/libdt_fd_forward.so \
lib/libdt_socket.so \
@@ -554,8 +552,6 @@
lib64/libartpalette.so \
lib64/libart.so \
lib64/libbacktrace.so \
- lib64/libdexfile_external.so \
- lib64/libdexfile_support.so \
lib64/libdexfile.so \
lib64/libdt_fd_forward.so \
lib64/libdt_socket.so \
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 1332945..5dcfe39 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -540,7 +540,6 @@
self._checker.check_native_library('libart-disassembler')
self._checker.check_native_library('libartbase')
self._checker.check_native_library('libartpalette')
- self._checker.check_native_library('libdexfile_support')
self._checker.check_native_library('libdt_fd_forward')
self._checker.check_native_library('libopenjdkjvm')
self._checker.check_native_library('libopenjdkjvmti')
diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp
index 35fd017..1817a31 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -72,11 +72,8 @@
"libsigchain",
],
- native_libs: [
- "libdexfile_support",
- ],
-
native_static_libs: [
+ "libdexfile_support",
"libdexfile_static",
"libnativehelper_lazy",
],
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index b8cdd8b..b6d91b9 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -352,11 +352,11 @@
// Support library with a C++ API for accessing the libdexfile API for external
// (non-ART) users.
//
-// This library dlopens libdexfile_external on first use, so there is no build
-// time dependency on dex file logic. It is therefore safe to use from binaries
+// This library dlopens libdexfile(d).so on first use, so there is no build time
+// dependency on dex file logic. It is therefore safe to use from binaries
// compiled without dex file support, given they won't encounter any dex file
// stack frames.
-art_cc_library {
+art_cc_library_static {
name: "libdexfile_support",
visibility: ["//visibility:public"],
host_supported: true,
@@ -397,6 +397,9 @@
"libartbase",
"libbase",
"libdexfile",
+ "liblog",
+ ],
+ static_libs: [
"libdexfile_support",
],
}