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

Merge "Dist the merged api txts for normal builds too"

Browse Source
This commit is contained in:
Anton Hansson
2020-10-21 09:54:49 +00:00
committed by Gerrit Code Review
parent 8c82061a05 a9ced809ad
commit 208cdcbf3f
1 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
api/Android.bp
View File

@@ -60,11 +60,18 @@ 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: { dists: [
{
targets: ["droidcore"],
dir: "api",
dest: "current.txt",
},
{
targets: ["sdk", "win_sdk"], targets: ["sdk", "win_sdk"],
dir: "apistubs/android/public/api", dir: "apistubs/android/public/api",
dest: "android.txt", dest: "android.txt",
}, },
],
} }
genrule { genrule {
@@ -83,6 +90,13 @@ genrule {
out: ["removed.txt"], out: ["removed.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)",
dists: [
{
targets: ["droidcore"],
dir: "api",
dest: "removed.txt",
},
],
} }
genrule { genrule {
@@ -100,11 +114,18 @@ 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: { dists: [
{
targets: ["droidcore"],
dir: "api",
dest: "system-current.txt",
},
{
targets: ["sdk", "win_sdk"], targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system/api", dir: "apistubs/android/system/api",
dest: "android.txt", dest: "android.txt",
}, },
],
} }
genrule { genrule {
@@ -122,6 +143,13 @@ genrule {
out: ["system-removed.txt"], out: ["system-removed.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)",
dists: [
{
targets: ["droidcore"],
dir: "api",
dest: "system-removed.txt",
},
],
} }
genrule { genrule {
@@ -139,11 +167,18 @@ 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: { dists: [
{
targets: ["droidcore"],
dir: "api",
dest: "module-lib-current.txt",
},
{
targets: ["sdk", "win_sdk"], targets: ["sdk", "win_sdk"],
dir: "apistubs/android/module-lib/api", dir: "apistubs/android/module-lib/api",
dest: "android.txt", dest: "android.txt",
}, },
],
} }
genrule { genrule {
@@ -161,6 +196,13 @@ genrule {
out: ["module-lib-removed.txt"], out: ["module-lib-removed.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)",
dists: [
{
targets: ["droidcore"],
dir: "api",
dest: "module-lib-removed.txt",
},
],
} }
genrule { genrule {