summaryrefslogtreecommitdiff
path: root/StubLibraries.bp
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2020-11-03 19:33:50 +0000
committerAnton Hansson <hansson@google.com>2020-11-03 19:33:50 +0000
commit533fb47c7e33b64749413057b436d4513a6e94af (patch)
tree7e04bf4af290798b25524858ec8fa024cf225f8d /StubLibraries.bp
parent56804f05607e5babe4ffd13262a937f54f24d7ee (diff)
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
Diffstat (limited to 'StubLibraries.bp')
-rw-r--r--StubLibraries.bp28
1 files changed, 15 insertions, 13 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 9047df5aba5c..aabf23b9f821 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -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",
@@ -363,6 +350,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" ],
static_libs: [