summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2022-02-24 11:53:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-24 11:53:01 +0000
commit5f6988d7c20b57ccd6662c034ed8a6eaef9ebe98 (patch)
tree3e35276e1b1638f913f7d64903d8fba38e647131
parenta4f94fdf5af2b4a9bb308dcb45f5bcd6697341c9 (diff)
parent4bd4bdf3a7222872de73b08342dc6b9c00730fc3 (diff)
Merge "Expand comment about using a merge api base" am: 0cf86f5a44 am: c36460bc4c am: 4bd4bdf3a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1997110 Change-Id: I688d3d23734c9af40502cf3f9e528c7541c0255d
-rw-r--r--api/Android.bp6
1 files changed, 4 insertions, 2 deletions
diff --git a/api/Android.bp b/api/Android.bp
index 40472b7e2d69..8370c1069710 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -186,8 +186,10 @@ genrule {
cmd: metalava_cmd +
"--check-compatibility:api:released $(location :android.api.module-lib.latest) " +
// 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
- // MODULE_LIBS -> public.
+ // ideally be a merged public+system (which metalava is not currently able to generate).
+ // 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) " +
"--baseline:compatibility:released $(location :android-incompatibilities.api.module-lib.latest) " +
"--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +