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

Commit 38658a56 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Run bpfmt on StubLibraries.bp" am: cf54ae88 

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

Change-Id: I9518c376705f7de903a5ec4bd6f78314bc8e7630
parents 44b2f6ce cf54ae88

StubLibraries.bp

+65 −26
Original line number Diff line number Diff line
@@ -120,13 +120,19 @@ droidstubs { 
    },

    dists: [

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/public/api",

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/public/api",

            dest: "android-non-updatable-removed.txt",

            tag: ".removed-api.txt",
@@ -134,20 +140,17 @@ droidstubs { 
    ],

}



priv_apps =

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

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

    "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +

    "\\)"



priv_apps_in_stubs =

    " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" +

priv_apps_in_stubs = " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" +

    "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +

    "\\)"



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



module_libs =

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

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

    "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +

    "\\)"
@@ -163,7 +166,7 @@ droidstubs { 
        last_released: {

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

            removed_api_file: ":android-non-updatable-removed.api.system.latest",

            baseline_file: ":android-non-updatable-incompatibilities.api.system.latest"

            baseline_file: ":android-non-updatable-incompatibilities.api.system.latest",

        },

        api_lint: {

            enabled: true,
@@ -173,13 +176,19 @@ droidstubs { 
    },

    dists: [

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/system/api",

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/system/api",

            dest: "android-non-updatable-removed.txt",

            tag: ".removed-api.txt",
@@ -203,25 +212,37 @@ droidstubs { 
    },

    dists: [

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/test/api",

            dest: "android.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/test/api",

            dest: "removed.txt",

            tag: ".removed-api.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/test/api",

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/test/api",

            dest: "android-non-updatable-removed.txt",

            tag: ".removed-api.txt",
@@ -249,13 +270,19 @@ droidstubs { 
    },

    dists: [

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/module-lib/api",

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            dir: "apistubs/android/module-lib/api",

            dest: "android-non-updatable-removed.txt",

            tag: ".removed-api.txt",
@@ -307,10 +334,13 @@ java_defaults { 
    java_version: "1.8",

    compile_dex: true,

    dist: {

        targets: ["sdk", "win_sdk"],

        targets: [

            "sdk",

            "win_sdk",

        ],

        tag: ".jar",

        dest: "android-non-updatable.jar",

    }

    },

}



java_library_static {
@@ -369,7 +399,10 @@ java_defaults { 
java_defaults {

    name: "android_stubs_dists_default",

    dist: {

        targets: ["sdk", "win_sdk"],

        targets: [

            "sdk",

            "win_sdk",

        ],

        tag: ".jar",

        dest: "android.jar",

    },
@@ -400,7 +433,10 @@ java_library_static { 
    dists: [

        {

            // Legacy dist path

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            tag: ".jar",

            dest: "android_system.jar",

        },
@@ -425,7 +461,10 @@ java_library_static { 
    dists: [

        {

            // Legacy dist path

            targets: ["sdk", "win_sdk"],

            targets: [

                "sdk",

                "win_sdk",

            ],

            tag: ".jar",

            dest: "android_test.jar",

        },