Dist merged jar instead of monolithic one

The monolithic ones are being deleted in a follow-up CL.

Bug: 158465496
Test: m sdk dist
Change-Id: I41b38d4828f8dc5d90dbb3ae59462812b8c036f2
This commit is contained in:
Anton Hansson
2020-11-03 19:33:50 +00:00
parent 56804f0560
commit 533fb47c7e

View File

@@ -332,19 +332,6 @@ java_library_static {
"framework-wifi.stubs",
"private-stub-annotations-jar",
],
defaults: ["android_defaults_stubs_current"],
}
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",
"android_stubs_dists_default",
@@ -362,6 +349,21 @@ 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",
srcs: [ ":system-api-stubs-docs-non-updatable" ],