Merge "Add module `libopenjdk` to the Android Runtime APEX module."
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 47729c1..aa199d3 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -34,14 +34,17 @@
"dexoptanalyzerd",
"profmand",
]
+// - Debug variants (libraries).
art_runtime_debug_native_shared_libs = [
"libartd",
"libartd-compiler",
- "libopenjdkd",
"libopenjdkjvmd",
"libopenjdkjvmtid",
"libadbconnectiond",
]
+libcore_debug_native_shared_libs = [
+ "libopenjdkd",
+]
// Data files associated with bionic / managed core library APIs.
art_runtime_data_file_prebuilts = [
@@ -77,6 +80,11 @@
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_shared_libs = [
+ "libopenjdk",
+]
+
apex_key {
name: "com.android.runtime.key",
public_key: "com.android.runtime.avbpubkey",
@@ -101,7 +109,8 @@
compile_multilib: "both",
manifest: "manifest.json",
native_shared_libs: art_runtime_base_native_shared_libs
- + bionic_native_shared_libs,
+ + bionic_native_shared_libs
+ + libcore_native_shared_libs,
multilib: {
both: {
// TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64`
@@ -130,7 +139,9 @@
manifest: "manifest.json",
native_shared_libs: art_runtime_base_native_shared_libs
+ art_runtime_debug_native_shared_libs
- + bionic_native_shared_libs,
+ + bionic_native_shared_libs
+ + libcore_native_shared_libs
+ + libcore_debug_native_shared_libs,
multilib: {
both: {
// TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64`
@@ -164,7 +175,9 @@
device_supported: false,
manifest: "manifest.json",
native_shared_libs: art_runtime_base_native_shared_libs
- + art_runtime_debug_native_shared_libs,
+ + art_runtime_debug_native_shared_libs
+ + libcore_native_shared_libs
+ + libcore_debug_native_shared_libs,
multilib: {
both: {
// TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64`
diff --git a/build/apex/runtests.sh b/build/apex/runtests.sh
index 9db325a..b2aa4df 100755
--- a/build/apex/runtests.sh
+++ b/build/apex/runtests.sh
@@ -157,6 +157,7 @@
check_library libprofile.so
# Check that the mounted image contains Android Core libraries.
check_library libjavacrypto.so
+ check_library libopenjdk.so
# Check that the mounted image contains additional required libraries.
check_library libadbconnection.so
@@ -193,11 +194,12 @@
check_library libartd-dexlayout.so
check_library libartd.so
check_library libdexfiled.so
- check_library libopenjdkd.so
check_library libopenjdkjvmd.so
check_library libopenjdkjvmtid.so
check_library libprofiled.so
- # Check that the mounted image contains additional required libraries.
+ # Check that the mounted image contains Android Core debug libraries.
+ check_library libopenjdkd.so
+ # Check that the mounted image contains additional required debug libraries.
check_library libadbconnectiond.so
}