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

Merge "Expand comment about using a merge api base" am: 0cf86f5a44 am: c36460bc4c am: 4bd4bdf3a7

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

Change-Id: I688d3d23734c9af40502cf3f9e528c7541c0255d
This commit is contained in:
Anton Hansson
2022-02-24 11:53:01 +00:00
committed by Automerger Merge Worker
parent a4f94fdf5a 4bd4bdf3a7
commit 5f6988d7c2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/Android.bp
View File

@@ -186,8 +186,10 @@ genrule {
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) " +
// Note: having "public" be the base of module-lib is not perfect -- it should // Note: having "public" be the base of module-lib is not perfect -- it should
// ideally be a merged public+system), but this will help when migrating from // ideally be a merged public+system (which metalava is not currently able to generate).
// MODULE_LIBS -> public. // This "base" will help when migrating from MODULE_LIBS -> public, but not when
// migrating from MODULE_LIBS -> system (where it needs to instead be listed as
// an incompatibility).
"--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) " +
"--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " + "--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +