Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90cec3e2 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Expand comment about using a merge api base" am: 0cf86f5a am:... 

Merge "Expand comment about using a merge api base" am: 0cf86f5a am: c36460bc am: 4bd4bdf3 am: 5f6988d7

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

Change-Id: I89493a188035d602ce75bf3c2f55677da0b29230
parents 1fd6c285 5f6988d7

api/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -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 " +