From c3002e5ec40bb48a1e9e9b770a12cb73a6028946 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Wed, 18 Nov 2020 18:23:55 +0000 Subject: Fix disting of android_system.jar The change I41b38d4828f8dc5d90dbb3ae59462812b8c036f2 accidentally started disting the public android.jar to the path where the system android.jar is expected. Move the dist rules from the public stubs to the system stubs where they belong. Bug: 172937217 Test: m sdk dist && \ zipinfo out/dist/apistubs/android/system/android.jar | \ fgrep telecom/Phone.class Change-Id: If20cb4ec32e1eb631a824ecc180d33c5088ff7c8 --- StubLibraries.bp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'StubLibraries.bp') diff --git a/StubLibraries.bp b/StubLibraries.bp index cb36e639545b..f62f2d59f039 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -272,21 +272,7 @@ java_library_static { "framework-wifi.stubs", "private-stub-annotations-jar", ], - defaults: [ - "android_defaults_stubs_current", - "android_stubs_dists_default", - ], - dist: { - dir: "apistubs/android/system", - }, - dists: [ - { - // Legacy dist path - targets: ["sdk", "win_sdk"], - tag: ".jar", - dest: "android_system.jar", - }, - ], + defaults: ["android_defaults_stubs_current"], } java_library_static { @@ -303,7 +289,21 @@ java_library_static { "framework-wifi.stubs.system", "private-stub-annotations-jar", ], - defaults: ["android_defaults_stubs_current"], + defaults: [ + "android_defaults_stubs_current", + "android_stubs_dists_default", + ], + dist: { + dir: "apistubs/android/system", + }, + dists: [ + { + // Legacy dist path + targets: ["sdk", "win_sdk"], + tag: ".jar", + dest: "android_system.jar", + }, + ], } java_library_static { -- cgit v1.2.3