commit c7f9e053eca9a0c2053ea98442a59a1010afa363
author Colin Cross <ccross@android.com> Tue Jul 10 09:29:55 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 10 09:29:55 2018 -0700
tree 6dd69744a4a845e529046ef57c43e8d7fb0748f3
parent 89e2a45c2029c56ed1b9aa1bed3fc08cdee7c88a
parent 19609a7993f30794e79f0f828b06c3ff96fdd20f

Merge "Mark installable jars with installable: true" am: 1035f48f61
am: 19609a7993

Change-Id: I4a345d295633892dc97789e9db21f381420e1b5c

Android.bp

diff --git a/Android.bp b/Android.bp
index fd4f71c..1fc5fe2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,6 +27,7 @@
 
 java_library {
     name: "framework",
+    installable: true,
 
     srcs: [
         // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS
@@ -759,6 +760,7 @@
 // ============================================================
 java_library {
     name: "ext",
+    installable: true,
     no_framework_libs: true,
     static_libs: [
         "libphonenumber-platform",

services/Android.bp

diff --git a/services/Android.bp b/services/Android.bp
index d125adc..bea51be 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -2,6 +2,7 @@
 // ============================================================
 java_library {
     name: "services",
+    installable: true,
 
     dex_preopt: {
         app_image: true,

test-base/Android.bp

diff --git a/test-base/Android.bp b/test-base/Android.bp
index a0e3985..9b1867c 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -21,6 +21,7 @@
 // Also contains the com.android.internal.util.Predicate[s] classes.
 java_library {
     name: "android.test.base",
+    installable: true,
 
     srcs: ["src/**/*.java"],
 
@@ -42,6 +43,7 @@
 // Also contains the com.android.internal.util.Predicate[s] classes.
 java_library {
     name: "legacy-test",
+    installable: true,
 
     sdk_version: "current",
     static_libs: ["android.test.base"],

test-mock/Android.bp

diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 51fa86b..1d971fb 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -18,6 +18,7 @@
 // ===================================
 java_library {
     name: "android.test.mock",
+    installable: true,
 
     java_version: "1.8",
     srcs: ["src/**/*.java"],

test-runner/Android.bp

diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index b50ba3b..540a09e 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -18,6 +18,7 @@
 // =====================================
 java_library {
     name: "android.test.runner",
+    installable: true,
 
     // Needs to be consistent with the repackaged version of this make target.
     java_version: "1.8",