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

Commit 5f21da54 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Make merged api compat checks output baseline" am: 6c20a2d6 am:... 

Merge "Make merged api compat checks output baseline" am: 6c20a2d6 am: c0101648 am: 25274a4c am: 3afc6af2

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

Change-Id: Iaa36a1b0558086df40df8610d4782fedd8e5881f
parents 21dd967a 3afc6af2

api/Android.bp

+10 −10
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ python_test_host { 
metalava_cmd = "$(location metalava)"

// Silence reflection warnings. See b/168689341

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 {

    name: "current-api-xml",
@@ -122,13 +122,13 @@ genrule { 
        ":android-incompatibilities.api.public.latest",

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

    ],

    out: ["stdout.txt"],

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

    tools: ["metalava"],

    cmd: metalava_cmd +

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

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

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

        "> $(genDir)/stdout.txt",

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

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

}



genrule {
@@ -247,14 +247,14 @@ genrule { 
        ":frameworks-base-api-current.txt",

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

    ],

    out: ["stdout.txt"],

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

    tools: ["metalava"],

    cmd: metalava_cmd +

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

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

        "> $(genDir)/stdout.txt",

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

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

}



genrule {
@@ -344,7 +344,7 @@ genrule { 
        ":frameworks-base-api-current.txt",

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

    ],

    out: ["stdout.txt"],

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

    tools: ["metalava"],

    cmd: metalava_cmd +

        "--check-compatibility:api:released $(location :android.api.module-lib.latest) " +
@@ -353,8 +353,8 @@ genrule { 
        // MODULE_LIBS -> public.

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

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

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

        "> $(genDir)/stdout.txt",

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

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

}



genrule {