Merge "Fix disting of android_system.jar" am: 0206a453f1 am: fad6403b9f am: 5294410614 am: 08290119fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503392 Change-Id: I5e0f69aa407d52dc41f163c9d3671baf6e21153b
This commit is contained in:
@@ -252,21 +252,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 {
|
||||
@@ -285,7 +271,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 {
|
||||
|
||||
Reference in New Issue
Block a user