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

Commit 780042cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove use of --check-compatibility:base" into main am: 88c837ff 

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



Change-Id: Ib0c64cd1afeda35aaf318f6b16734e062f6a23a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40f6d20f 88c837ff

api/Android.bp

+10 −7
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ genrule { 
genrule {

    name: "frameworks-base-api-system-current-compat",

    srcs: [

        ":android.api.public.latest",

        ":android.api.system.latest",

        ":android-incompatibilities.api.system.latest",

        ":frameworks-base-api-current.txt",
@@ -165,33 +166,35 @@ genrule { 
    out: ["updated-baseline.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd +

        "--check-compatibility:api:released $(location :android.api.public.latest) " +

        "--check-compatibility:api:released $(location :android.api.system.latest) " +

        "--check-compatibility:base $(location :frameworks-base-api-current.txt) " +

        "--baseline:compatibility:released $(location :android-incompatibilities.api.system.latest) " +

        "--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +

        "$(location :frameworks-base-api-current.txt) " +

        "$(location :frameworks-base-api-system-current.txt)",

}



genrule {

    name: "frameworks-base-api-module-lib-current-compat",

    srcs: [

        ":android.api.public.latest",

        ":android.api.system.latest",

        ":android.api.module-lib.latest",

        ":android-incompatibilities.api.module-lib.latest",

        ":frameworks-base-api-current.txt",

        ":frameworks-base-api-system-current.txt",

        ":frameworks-base-api-module-lib-current.txt",

    ],

    out: ["updated-baseline.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd +

        "--check-compatibility:api:released $(location :android.api.public.latest) " +

        "--check-compatibility:api:released $(location :android.api.system.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

        // 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 " +

        "$(location :frameworks-base-api-current.txt) " +

        "$(location :frameworks-base-api-system-current.txt) " +

        "$(location :frameworks-base-api-module-lib-current.txt)",

}