Dist the merged api txts for normal builds too
Makes the merged txts available on the build server for most
continuous builds.
Bug: 169034951
Bug: 170802619
Test: m dist && diff frameworks/base/api and out/dist/api
Change-Id: I57daa8e42c3931070f19cde9a74d2b11d03d2d6d
diff --git a/api/Android.bp b/api/Android.bp
index fd0303b..9f99b78c 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -60,11 +60,18 @@
out: ["current.txt"],
tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
- dist: {
- targets: ["sdk", "win_sdk"],
- dir: "apistubs/android/public/api",
- dest: "android.txt",
- },
+ dists: [
+ {
+ targets: ["droidcore"],
+ dir: "api",
+ dest: "current.txt",
+ },
+ {
+ targets: ["sdk", "win_sdk"],
+ dir: "apistubs/android/public/api",
+ dest: "android.txt",
+ },
+ ],
}
genrule {
@@ -83,6 +90,13 @@
out: ["removed.txt"],
tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+ dists: [
+ {
+ targets: ["droidcore"],
+ dir: "api",
+ dest: "removed.txt",
+ },
+ ],
}
genrule {
@@ -100,11 +114,18 @@
out: ["system-current.txt"],
tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
- dist: {
- targets: ["sdk", "win_sdk"],
- dir: "apistubs/android/system/api",
- dest: "android.txt",
- },
+ dists: [
+ {
+ targets: ["droidcore"],
+ dir: "api",
+ dest: "system-current.txt",
+ },
+ {
+ targets: ["sdk", "win_sdk"],
+ dir: "apistubs/android/system/api",
+ dest: "android.txt",
+ },
+ ],
}
genrule {
@@ -122,6 +143,13 @@
out: ["system-removed.txt"],
tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+ dists: [
+ {
+ targets: ["droidcore"],
+ dir: "api",
+ dest: "system-removed.txt",
+ },
+ ],
}
genrule {
@@ -139,11 +167,18 @@
out: ["module-lib-current.txt"],
tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
- dist: {
- targets: ["sdk", "win_sdk"],
- dir: "apistubs/android/module-lib/api",
- dest: "android.txt",
- },
+ dists: [
+ {
+ targets: ["droidcore"],
+ dir: "api",
+ dest: "module-lib-current.txt",
+ },
+ {
+ targets: ["sdk", "win_sdk"],
+ dir: "apistubs/android/module-lib/api",
+ dest: "android.txt",
+ },
+ ],
}
genrule {
@@ -161,6 +196,13 @@
out: ["module-lib-removed.txt"],
tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+ dists: [
+ {
+ targets: ["droidcore"],
+ dir: "api",
+ dest: "module-lib-removed.txt",
+ },
+ ],
}
genrule {