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

Commit f297e449 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 887f4fbc to... 

Merge "resolve merge conflicts of 887f4fbc to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp
parents 18a450a9 024ea641

StubLibraries.bp

+7 −7
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ droidstubs { 
    args: metalava_framework_docs_args,

    check_api: {

        current: {

            api_file: "non-updatable-api/current.txt",

            removed_api_file: "non-updatable-api/removed.txt",

            api_file: "core/api/current.txt",

            removed_api_file: "core/api/removed.txt",

        },

        last_released: {

            api_file: ":android-non-updatable.api.public.latest",
@@ -208,8 +208,8 @@ droidstubs { 
    args: metalava_framework_docs_args + priv_apps,

    check_api: {

        current: {

            api_file: "non-updatable-api/system-current.txt",

            removed_api_file: "non-updatable-api/system-removed.txt",

            api_file: "core/api/system-current.txt",

            removed_api_file: "core/api/system-removed.txt",

        },

        last_released: {

            api_file: ":android-non-updatable.api.system.latest",
@@ -219,7 +219,7 @@ droidstubs { 
        api_lint: {

            enabled: true,

            new_since: ":android-non-updatable.api.system.latest",

            baseline_file: "non-updatable-api/system-lint-baseline.txt",

            baseline_file: "core/api/system-lint-baseline.txt",

        },

    },

}
@@ -264,8 +264,8 @@ droidstubs { 
    args: metalava_framework_docs_args + priv_apps + module_libs,

    check_api: {

        current: {

            api_file: "non-updatable-api/module-lib-current.txt",

            removed_api_file: "non-updatable-api/module-lib-removed.txt",

            api_file: "core/api/module-lib-current.txt",

            removed_api_file: "core/api/module-lib-removed.txt",

        },

        last_released: {

            api_file: ":android-non-updatable.api.module-lib.latest",

non-updatable-api/Android.bp→core/api/Android.bp

+0 −0

File moved.

View file

non-updatable-api/current.txt→core/api/current.txt

+0 −0

File moved.

View file