drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix disting of android_system.jar" am: 0206a453f1 am: fad6403b9f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503392

Change-Id: I268f89bb49ecb6d108d4bb32185650d52340c052
This commit is contained in:
Treehugger Robot
2020-11-18 21:48:40 +00:00
committed by Automerger Merge Worker
parent d886dc9991 fad6403b9f
commit 5294410614
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
StubLibraries.bp
View File

@ -247,21 +247,7 @@ java_library_static {
"framework-wifi.stubs", "framework-wifi.stubs",
"private-stub-annotations-jar", "private-stub-annotations-jar",
], ],
defaults: [ defaults: ["android_defaults_stubs_current"],
"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 { java_library_static {
@ -278,7 +264,21 @@ java_library_static {
"framework-wifi.stubs.system", "framework-wifi.stubs.system",
"private-stub-annotations-jar", "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 { java_library_static {