Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move the dist rules from monolithic to merged rules" am: 99398da506 am: 3b8ec2dcac am: 88901af27b

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

Change-Id: I2d3150f9b3a071f25236a09b07fb9c5bf008480f
This commit is contained in:
Anton Hansson
2020-10-12 11:36:59 +00:00
committed by Automerger Merge Worker
parent 72432ab0f4 88901af27b
commit b5fcebde9d
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
StubLibraries.bp
View File

@@ -139,11 +139,6 @@ droidstubs {
baseline_file: "api/lint-baseline.txt", baseline_file: "api/lint-baseline.txt",
}, },
}, },
dist: {
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/public/api",
dest: "android.txt",
},
jdiff_enabled: true, jdiff_enabled: true,
} }
@@ -206,11 +201,6 @@ droidstubs {
baseline_file: "api/system-lint-baseline.txt", baseline_file: "api/system-lint-baseline.txt",
}, },
}, },
dist: {
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system/api",
dest: "android.txt",
},
jdiff_enabled: true, jdiff_enabled: true,
} }
@@ -291,11 +281,6 @@ droidstubs {
baseline_file: "api/module-lib-lint-baseline.txt", baseline_file: "api/module-lib-lint-baseline.txt",
}, },
}, },
dist: {
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/module-lib/api",
dest: "android.txt",
},
} }
droidstubs { droidstubs {

15
api/Android.bp
View File

@@ -60,6 +60,11 @@ genrule {
out: ["current.txt"], out: ["current.txt"],
tools: ["metalava"], tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)", cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
dist: {
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/public/api",
dest: "android.txt",
},
} }
genrule { genrule {
@@ -95,6 +100,11 @@ genrule {
out: ["system-current.txt"], out: ["system-current.txt"],
tools: ["metalava"], tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)", cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
dist: {
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system/api",
dest: "android.txt",
},
} }
genrule { genrule {
@@ -129,6 +139,11 @@ genrule {
out: ["module-lib-current.txt"], out: ["module-lib-current.txt"],
tools: ["metalava"], tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)", cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
dist: {
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/module-lib/api",
dest: "android.txt",
},
} }
genrule { genrule {