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

Commit 27d32fd7 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "FlaggedApi: enable enforcement for all non-updatable APIs" into main

parents 3081fa83 7da1d255

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ metalava_framework_docs_args = "" + 
    "--api-lint-ignore-prefix org. " +

    "--error NoSettingsProvider " +

    "--error UnhiddenSystemApi " +

    "--error UnflaggedApi " +

    "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.* " +

    "--hide BroadcastBehavior " +

    "--hide CallbackInterface " +

api/StubLibraries.bp

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ droidstubs { 
        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",

    ],

    args: metalava_framework_docs_args + "--error UnflaggedApi ",

    args: metalava_framework_docs_args,

    check_api: {

        current: {

            api_file: ":non-updatable-current.txt",
@@ -74,8 +74,7 @@ priv_apps_in_stubs = " --show-for-stub-purposes-annotation android.annotation.Sy 
    "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +

    "\\)"



test = " --show-annotation android.annotation.TestApi" +

    " --hide UnflaggedApi" // TODO(b/297362755): TestApi lint doesn't ignore existing APIs.

test = " --show-annotation android.annotation.TestApi"



module_libs = " --show-annotation android.annotation.SystemApi\\(" +

    "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +
@@ -134,6 +133,7 @@ droidstubs { 
        },

        api_lint: {

            enabled: true,

            new_since: ":android.api.test.latest",

            baseline_file: ":non-updatable-test-lint-baseline.txt",

        },

    },

core/api/system-lint-baseline.txt

+4 −2734

File changed.

Preview size limit exceeded, changes collapsed.

core/api/test-lint-baseline.txt

+324 −0

File changed.

Preview size limit exceeded, changes collapsed.