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

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

Change-Id: I1efc39fb23aeaaa788ed7fbb559b871bb3a1b283
This commit is contained in:
Treehugger Robot
2020-11-18 22:01:04 +00:00
committed by Automerger Merge Worker

View File

@ -247,21 +247,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 {
@ -278,7 +264,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 {