Rename variable containing Core Java libraries in build/apex/Android.bp.
Rename `libcore_target_java_libs` as `libcore_java_libs`, as that
variable is used for both device and host APEX packages.
Test: mmma art/build/apex
Bug: 113373927
Change-Id: Iad2838437aacc3c267f140c036c6dfcd479bec6c
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f7ed826..735755f 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -94,7 +94,16 @@
"libartd-disassembler"
]
-// Libcore native libraries.
+// Core Java libraries.
+libcore_java_libs = [
+ "core-oj",
+ "core-libart",
+ "okhttp",
+ "bouncycastle",
+ "apache-xml",
+]
+
+// Native libraries that support the core Java libraries.
libcore_native_shared_libs = [
"libjavacore",
"libopenjdk",
@@ -103,15 +112,6 @@
"libziparchive"
]
-// Java libraries
-libcore_target_java_libs = [
- "core-oj",
- "core-libart",
- "okhttp",
- "bouncycastle",
- "apache-xml",
-]
-
// Temporary library includes for b/123591866 as all libraries are moved into the main art-apex.
art_runtime_libraries_zipapex = [
"libnativebridge",
@@ -143,7 +143,7 @@
name: "com.android.runtime.release",
compile_multilib: "both",
manifest: "manifest.json",
- java_libs: libcore_target_java_libs,
+ java_libs: libcore_java_libs,
native_shared_libs: art_runtime_base_native_shared_libs
+ bionic_native_shared_libs
+ libcore_native_shared_libs,
@@ -173,7 +173,7 @@
name: "com.android.runtime.debug",
compile_multilib: "both",
manifest: "manifest.json",
- java_libs: libcore_target_java_libs,
+ java_libs: libcore_java_libs,
native_shared_libs: art_runtime_base_native_shared_libs
+ art_runtime_debug_native_shared_libs
+ bionic_native_shared_libs
@@ -212,7 +212,7 @@
host_supported: true,
device_supported: false,
manifest: "manifest.json",
- java_libs: libcore_target_java_libs,
+ java_libs: libcore_java_libs,
ignore_system_library_special_case: true,
native_shared_libs: art_runtime_base_native_shared_libs
+ art_runtime_debug_native_shared_libs