diff options
| author | Anton Hansson <hansson@google.com> | 2020-11-18 18:23:55 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-11-18 18:37:34 +0000 |
| commit | c3002e5ec40bb48a1e9e9b770a12cb73a6028946 (patch) | |
| tree | e90c0657e8ae2623c7b6f805f374fc0259aae394 | |
| parent | 15c869f6ad2643a584a66ebeb51a7bf7391b13a4 (diff) | |
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
| -rw-r--r-- | StubLibraries.bp | 32 |
1 files changed, 16 insertions, 16 deletions
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 { |