diff options
| author | 2018-07-10 14:51:50 +0000 | |
|---|---|---|
| committer | 2018-07-10 14:51:50 +0000 | |
| commit | 1035f48f612f259cfa4b6433a5d62cda7355f4ff (patch) | |
| tree | 44abbccc1b3a295f6c4fab8013e377d342443d4e | |
| parent | 079f03f584e24915a296aaa4d8512ca1a7111e09 (diff) | |
| parent | a12c0f506cf509e1220f0095010350181c31c367 (diff) | |
Merge "Mark installable jars with installable: true"
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | services/Android.bp | 1 | ||||
| -rw-r--r-- | test-base/Android.bp | 2 | ||||
| -rw-r--r-- | test-mock/Android.bp | 1 | ||||
| -rw-r--r-- | test-runner/Android.bp | 1 |
5 files changed, 7 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index f11b6fe0e13c..e50241af0bd8 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 @@ -672,6 +673,7 @@ gensrcs { // ============================================================ java_library { name: "ext", + installable: true, no_framework_libs: true, static_libs: [ "libphonenumber-platform", diff --git a/services/Android.bp b/services/Android.bp index d125adc5fa7d..bea51be321c9 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -2,6 +2,7 @@ // ============================================================ java_library { name: "services", + installable: true, dex_preopt: { app_image: true, diff --git a/test-base/Android.bp b/test-base/Android.bp index a0e39856e9c7..9b1867cd90fd 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 @@ java_library { // 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"], diff --git a/test-mock/Android.bp b/test-mock/Android.bp index 8fb6fda41f59..848fd7c2199e 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -18,6 +18,7 @@ // =================================== java_library { name: "android.test.mock", + installable: true, // Needs to be consistent with the repackaged version of this make target. java_version: "1.8", diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 29d7ea9b5e80..c0eb489d5ab3 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", |