Merge "Remove unused monolithic jars" am: fd4bcbd76a am: dd64b2cbf9 am: 942afe4c9f

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

Change-Id: Ia7eb172d65dfce0be6d87195db8270113059a368
This commit is contained in:
Anton Hansson
2020-11-05 11:15:40 +00:00
committed by Automerger Merge Worker

View File

@@ -312,14 +312,7 @@ java_defaults {
}
java_library_static {
name: "android_monolith_stubs_current",
srcs: [ ":api-stubs-docs" ],
static_libs: [ "private-stub-annotations-jar" ],
defaults: ["android_defaults_stubs_current"],
}
java_library_static {
name: "android_merged_stubs_current",
name: "android_stubs_current",
srcs: [ ":api-stubs-docs-non-updatable" ],
static_libs: [
"conscrypt.module.public.api.stubs",
@@ -350,22 +343,7 @@ java_library_static {
}
java_library_static {
name: "android_stubs_current",
static_libs: ["android_merged_stubs_current"],
defaults: ["android_defaults_stubs_current"],
}
java_library_static {
name: "android_system_monolith_stubs_current",
srcs: [ ":system-api-stubs-docs" ],
static_libs: [ "private-stub-annotations-jar" ],
defaults: [
"android_defaults_stubs_current",
],
}
java_library_static {
name: "android_system_merged_stubs_current",
name: "android_system_stubs_current",
srcs: [ ":system-api-stubs-docs-non-updatable" ],
static_libs: [
"conscrypt.module.public.api.stubs",
@@ -381,12 +359,6 @@ java_library_static {
defaults: ["android_defaults_stubs_current"],
}
java_library_static {
name: "android_system_stubs_current",
static_libs: ["android_system_merged_stubs_current"],
defaults: ["android_defaults_stubs_current"],
}
java_library_static {
name: "android_test_stubs_current",
srcs: [ ":test-api-stubs-docs" ],