Merge "Convert java_library_static to java_library" am: 0f6542d422

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686656

Change-Id: I9f7ac868de9b259a1162597e819e7b1b900298bb
This commit is contained in:
Anton Hansson
2021-04-29 11:00:32 +00:00
committed by Automerger Merge Worker

View File

@ -347,7 +347,7 @@ java_defaults {
visibility: ["//visibility:private"],
}
java_library_static {
java_library {
name: "android-non-updatable.stubs",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":api-stubs-docs-non-updatable"],
@ -357,7 +357,7 @@ java_library_static {
},
}
java_library_static {
java_library {
name: "android-non-updatable.stubs.system",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":system-api-stubs-docs-non-updatable"],
@ -367,7 +367,7 @@ java_library_static {
},
}
java_library_static {
java_library {
name: "android-non-updatable.stubs.module_lib",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":module-lib-api-stubs-docs-non-updatable"],
@ -381,7 +381,7 @@ java_library_static {
},
}
java_library_static {
java_library {
name: "android-non-updatable.stubs.test",
defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":test-api-stubs-docs-non-updatable"],
@ -404,7 +404,7 @@ java_defaults {
defaults_visibility: ["//frameworks/base/services"],
}
java_library_static {
java_library {
name: "android_stubs_current",
static_libs: modules_public_stubs + [
"android-non-updatable.stubs",
@ -413,7 +413,7 @@ java_library_static {
defaults: ["android.jar_defaults"],
}
java_library_static {
java_library {
name: "android_system_stubs_current",
static_libs: modules_system_stubs + [
"android-non-updatable.stubs.system",
@ -439,7 +439,7 @@ java_library_static {
],
}
java_library_static {
java_library {
name: "android_test_stubs_current",
// Modules do not have test APIs, but we want to include their SystemApis, like we include
// the SystemApi of framework-non-updatable-sources.
@ -456,7 +456,7 @@ java_library_static {
},
}
java_library_static {
java_library {
name: "android_module_lib_stubs_current",
defaults: [
"android.jar_defaults",
@ -520,7 +520,7 @@ droidstubs {
visibility: ["//visibility:private"],
}
java_library_static {
java_library {
name: "hwbinder.stubs",
sdk_version: "core_current",
libs: ["framework-annotations-lib"],