Revert "Revert "Include core library jars in runtime apex.""
This reverts commit 8828ddf011dbc453982bbb8a51494bc626efb8e7.
Reason for revert: Sailfish size issues fixed.
Change-Id: I03e22af485918fb41e41eed86b2a7b13f2462128
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index aa199d3..9bf6551 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -85,6 +85,15 @@
"libopenjdk",
]
+// Java libraries
+libcore_target_java_libs = [
+ "core-oj",
+ "core-libart",
+ "okhttp",
+ "bouncycastle",
+ "apache-xml",
+]
+
apex_key {
name: "com.android.runtime.key",
public_key: "com.android.runtime.avbpubkey",
@@ -108,6 +117,7 @@
name: "com.android.runtime.release",
compile_multilib: "both",
manifest: "manifest.json",
+ java_libs: libcore_target_java_libs,
native_shared_libs: art_runtime_base_native_shared_libs
+ bionic_native_shared_libs
+ libcore_native_shared_libs,
@@ -137,6 +147,7 @@
name: "com.android.runtime.debug",
compile_multilib: "both",
manifest: "manifest.json",
+ java_libs: libcore_target_java_libs,
native_shared_libs: art_runtime_base_native_shared_libs
+ art_runtime_debug_native_shared_libs
+ bionic_native_shared_libs