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

Merge "Make merged api compat checks output baseline" am: 6c20a2d6b2 am: c010164844 am: 25274a4c6c am: 3afc6af257

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

Change-Id: Iaa36a1b0558086df40df8610d4782fedd8e5881f
This commit is contained in:
Anton Hansson
2021-09-23 05:26:54 +00:00
committed by Automerger Merge Worker
parent 21dd967a1f 3afc6af257
commit 5f21da5428
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/Android.bp
View File

@@ -62,7 +62,7 @@ python_test_host {
metalava_cmd = "$(location metalava)" metalava_cmd = "$(location metalava)"
// Silence reflection warnings. See b/168689341 // Silence reflection warnings. See b/168689341
metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED " metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED "
metalava_cmd += " --no-banner --format=v2 " metalava_cmd += " --quiet --no-banner --format=v2 "
genrule { genrule {
name: "current-api-xml", name: "current-api-xml",
@@ -122,13 +122,13 @@ genrule {
":android-incompatibilities.api.public.latest", ":android-incompatibilities.api.public.latest",
":frameworks-base-api-current.txt", ":frameworks-base-api-current.txt",
], ],
out: ["stdout.txt"], out: ["updated-baseline.txt"],
tools: ["metalava"], tools: ["metalava"],
cmd: metalava_cmd + cmd: metalava_cmd +
"--check-compatibility:api:released $(location :android.api.public.latest) " + "--check-compatibility:api:released $(location :android.api.public.latest) " +
"--baseline:compatibility:released $(location :android-incompatibilities.api.public.latest) " + "--baseline:compatibility:released $(location :android-incompatibilities.api.public.latest) " +
"$(location :frameworks-base-api-current.txt) " + "--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +
"> $(genDir)/stdout.txt", "$(location :frameworks-base-api-current.txt)",
} }
genrule { genrule {
@@ -247,14 +247,14 @@ genrule {
":frameworks-base-api-current.txt", ":frameworks-base-api-current.txt",
":frameworks-base-api-system-current.txt", ":frameworks-base-api-system-current.txt",
], ],
out: ["stdout.txt"], out: ["updated-baseline.txt"],
tools: ["metalava"], tools: ["metalava"],
cmd: metalava_cmd + cmd: metalava_cmd +
"--check-compatibility:api:released $(location :android.api.system.latest) " + "--check-compatibility:api:released $(location :android.api.system.latest) " +
"--check-compatibility:base $(location :frameworks-base-api-current.txt) " + "--check-compatibility:base $(location :frameworks-base-api-current.txt) " +
"--baseline:compatibility:released $(location :android-incompatibilities.api.system.latest) " + "--baseline:compatibility:released $(location :android-incompatibilities.api.system.latest) " +
"$(location :frameworks-base-api-system-current.txt) " + "--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +
"> $(genDir)/stdout.txt", "$(location :frameworks-base-api-system-current.txt)",
} }
genrule { genrule {
@@ -344,7 +344,7 @@ genrule {
":frameworks-base-api-current.txt", ":frameworks-base-api-current.txt",
":frameworks-base-api-module-lib-current.txt", ":frameworks-base-api-module-lib-current.txt",
], ],
out: ["stdout.txt"], out: ["updated-baseline.txt"],
tools: ["metalava"], tools: ["metalava"],
cmd: metalava_cmd + cmd: metalava_cmd +
"--check-compatibility:api:released $(location :android.api.module-lib.latest) " + "--check-compatibility:api:released $(location :android.api.module-lib.latest) " +
@@ -353,8 +353,8 @@ genrule {
// MODULE_LIBS -> public. // MODULE_LIBS -> public.
"--check-compatibility:base $(location :frameworks-base-api-current.txt) " + "--check-compatibility:base $(location :frameworks-base-api-current.txt) " +
"--baseline:compatibility:released $(location :android-incompatibilities.api.module-lib.latest) " + "--baseline:compatibility:released $(location :android-incompatibilities.api.module-lib.latest) " +
"$(location :frameworks-base-api-module-lib-current.txt) " + "--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +
"> $(genDir)/stdout.txt", "$(location :frameworks-base-api-module-lib-current.txt)",
} }
genrule { genrule {