From 533fb47c7e33b64749413057b436d4513a6e94af Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 3 Nov 2020 19:33:50 +0000 Subject: 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 --- StubLibraries.bp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'StubLibraries.bp') 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", @@ -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" ], -- cgit v1.2.3