Merge "Dist the merged api txts for normal builds too" am: 208cdcbf3f am: a1e66b4d43

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

Change-Id: I395855c24665e052cd0ce7520482d324c095a47d
This commit is contained in:
Anton Hansson
2020-10-21 10:44:17 +00:00
committed by Automerger Merge Worker

View File

@@ -60,11 +60,18 @@ genrule {
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 @@ genrule {
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 @@ genrule {
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 @@ genrule {
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 @@ genrule {
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 @@ genrule {
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 {