Mark installable jars with installable: true
Most jars don't need to be installed on the device. Instead of
using java_library and java_library_static to distinguish between
them make java_library and java_library_static identical and use
installable: true to identify the few jars that need to be dexed
and installed on the device.
Bug: 110885583
Test: m checkbuild
Change-Id: Ic51aa79dfc4aba435b6c2cb896968447133f313d
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index a690c20..517cc05 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -99,6 +99,7 @@
java_library {
name: "core-oj",
defaults: ["libcore_java_defaults"],
+ installable: true,
hostdex: true,
srcs: [":openjdk_java_files"],
@@ -122,6 +123,7 @@
java_library {
name: "core-libart",
defaults: ["libcore_java_defaults"],
+ installable: true,
hostdex: true,
srcs: [
@@ -147,6 +149,7 @@
// but these will not be stripped. See b/24535627.
java_library {
name: "core-oj-testdex",
+ installable: true,
static_libs: ["core-oj"],
no_standard_libs: true,
libs: ["core-all"],
@@ -164,6 +167,7 @@
java_library {
name: "core-libart-testdex",
+ installable: true,
static_libs: ["core-libart"],
no_standard_libs: true,
libs: ["core-all"],