Move remaining libcore JNI libraries to APEX.
Test: art/build/apex/runtests.sh (but see b/123079311)
Test: Flash and boot on Taimen
Test: atest CtsLibcoreTestCases CtsJniTestCases
Bug: 119090773
Change-Id: Ic780102b8f690ff10aafa0dc272b1f9d7b05bf96
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f271ea1..d53a7f2 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -79,9 +79,13 @@
art_tools_device_binaries = art_tools_common_binaries + art_tools_device_only_binaries
art_tools_host_binaries = art_tools_common_binaries + art_tools_host_only_binaries
-// (Some) Libcore native libraries.
+// Libcore native libraries.
libcore_native_shared_libs = [
+ "libjavacore",
"libopenjdk",
+ "libexpat",
+ "libz",
+ "libziparchive"
]
// Java libraries
diff --git a/build/apex/runtests.sh b/build/apex/runtests.sh
index f5b4dce..35887a2 100755
--- a/build/apex/runtests.sh
+++ b/build/apex/runtests.sh
@@ -175,7 +175,12 @@
check_library libopenjdkjvmti.so
check_library libprofile.so
# Check that the mounted image contains Android Core libraries.
+ check_library "libexpat${host_suffix}.so"
+ check_library libjavacore.so
+ check_library libjavacrypto.so
check_library libopenjdk.so
+ check_library "libz${host_suffix}.so"
+ check_library libziparchive.so
# Check that the mounted image contains additional required libraries.
check_library libadbconnection.so
@@ -284,6 +289,7 @@
work_dir=$(mktemp -d)
mount_point="$work_dir/image"
+host_suffix=""
trap finish_target EXIT
@@ -317,6 +323,7 @@
work_dir=$(mktemp -d)
mount_point="$work_dir/image"
+host_suffix=""
trap finish_target EXIT
@@ -388,6 +395,7 @@
work_dir=$(mktemp -d)
mount_point="$work_dir/zip"
+host_suffix="-host"
trap finish_host EXIT
