diff options
| author | Colin Cross <ccross@android.com> | 2018-07-10 09:45:03 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-10 09:45:03 -0700 |
| commit | a977a37c85c4ea5fb785310e0ae78d4d0aa58528 (patch) | |
| tree | 6515bcca981019ce80f6f14d662bd6ffdfd46408 | |
| parent | 0ae3baae77a2d690edc43afd9d24bd73ed2e8bfa (diff) | |
| parent | c7f9e053eca9a0c2053ea98442a59a1010afa363 (diff) | |
Merge "Mark installable jars with installable: true" am: 1035f48f61 am: 19609a7993
am: c7f9e053ec
Change-Id: I5934f14ced4a89fa234d75fde733aae1f102cc7a
| -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 db0f0eae6658..c8a1c937ca33 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 @@ -761,6 +762,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 194b90ee95e6..d25b47727c0b 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 86fd65340fee..8d3faaef9f6b 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"], diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 8f095f422555..2caa6c45f16b 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", |