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

am: 19609a7993

Change-Id: I4a345d295633892dc97789e9db21f381420e1b5c
This commit is contained in:
Colin Cross
2018-07-10 09:29:55 -07:00
committed by android-build-merger
5 changed files with 7 additions and 0 deletions

View File

@@ -27,6 +27,7 @@
java_library { java_library {
name: "framework", name: "framework",
installable: true,
srcs: [ srcs: [
// From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS
@@ -759,6 +760,7 @@ gensrcs {
// ============================================================ // ============================================================
java_library { java_library {
name: "ext", name: "ext",
installable: true,
no_framework_libs: true, no_framework_libs: true,
static_libs: [ static_libs: [
"libphonenumber-platform", "libphonenumber-platform",

View File

@@ -2,6 +2,7 @@
// ============================================================ // ============================================================
java_library { java_library {
name: "services", name: "services",
installable: true,
dex_preopt: { dex_preopt: {
app_image: true, app_image: true,

View File

@@ -21,6 +21,7 @@
// Also contains the com.android.internal.util.Predicate[s] classes. // Also contains the com.android.internal.util.Predicate[s] classes.
java_library { java_library {
name: "android.test.base", name: "android.test.base",
installable: true,
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
@@ -42,6 +43,7 @@ java_library {
// Also contains the com.android.internal.util.Predicate[s] classes. // Also contains the com.android.internal.util.Predicate[s] classes.
java_library { java_library {
name: "legacy-test", name: "legacy-test",
installable: true,
sdk_version: "current", sdk_version: "current",
static_libs: ["android.test.base"], static_libs: ["android.test.base"],

View File

@@ -18,6 +18,7 @@
// =================================== // ===================================
java_library { java_library {
name: "android.test.mock", name: "android.test.mock",
installable: true,
java_version: "1.8", java_version: "1.8",
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],

View File

@@ -18,6 +18,7 @@
// ===================================== // =====================================
java_library { java_library {
name: "android.test.runner", name: "android.test.runner",
installable: true,
// Needs to be consistent with the repackaged version of this make target. // Needs to be consistent with the repackaged version of this make target.
java_version: "1.8", java_version: "1.8",