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

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

Merge "Dist more API txt files" am: 45b39d81 am: d787b050 am: 5e4e7cec 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5b9c0e91e49db2edf2706616667a9e681fed649
parents 17d13191 5e4e7cec

StubLibraries.bp

+68 −5
Original line number Diff line number Diff line
@@ -123,6 +123,20 @@ droidstubs { 
            new_since: ":android-non-updatable.api.public.latest",

        },

    },

    dists: [

        {

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

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

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

            tag: ".api.txt",

        },

        {

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

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

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

            tag: ".removed-api.txt",

        },

    ],

}



priv_apps =
@@ -162,6 +176,20 @@ droidstubs { 
            baseline_file: "core/api/system-lint-baseline.txt",

        },

    },

    dists: [

        {

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

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

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

            tag: ".api.txt",

        },

        {

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

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

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

            tag: ".removed-api.txt",

        },

    ],

}



droidstubs {
@@ -178,11 +206,32 @@ droidstubs { 
            baseline_file: "core/api/test-lint-baseline.txt",

        },

    },

    dist: {

    dists: [

        {

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

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

            dest: "android.txt",

            tag: ".api.txt",

        },

        {

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

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

            dest: "removed.txt",

            tag: ".removed-api.txt",

        },

        {

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

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

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

            tag: ".api.txt",

        },

        {

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

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

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

            tag: ".removed-api.txt",

        },

    ],

}



droidstubs {
@@ -203,6 +252,20 @@ droidstubs { 
            new_since: ":android-non-updatable.api.module-lib.latest",

        },

    },

    dists: [

        {

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

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

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

            tag: ".api.txt",

        },

        {

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

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

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

            tag: ".removed-api.txt",

        },

    ],

}



/////////////////////////////////////////////////////////////////////

api/Android.bp

+18 −12
Original line number Diff line number Diff line
@@ -52,10 +52,7 @@ genrule { 
            dest: "current.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

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

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

            dest: "android.txt",

        },
@@ -112,6 +109,11 @@ genrule { 
            dir: "api",

            dest: "removed.txt",

        },

        {

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

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

            dest: "removed.txt",

        },

    ],

}
@@ -139,10 +141,7 @@ genrule { 
            dest: "system-current.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

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

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

            dest: "android.txt",

        },
@@ -173,6 +172,11 @@ genrule { 
            dir: "api",

            dest: "system-removed.txt",

        },

        {

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

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

            dest: "removed.txt",

        },

    ],

    visibility: ["//visibility:public"],

}
@@ -201,10 +205,7 @@ genrule { 
            dest: "module-lib-current.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

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

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

            dest: "android.txt",

        },
@@ -234,6 +235,11 @@ genrule { 
            dir: "api",

            dest: "module-lib-removed.txt",

        },

        {

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

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

            dest: "removed.txt",

        },

    ],

}

services/Android.bp

+14 −5
Original line number Diff line number Diff line
@@ -147,11 +147,20 @@ droidstubs { 
            baseline_file: "api/lint-baseline.txt",

        },

    },

    dist: {

    dists: [

        {

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

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

            dest: "android.txt",

            tag: ".api.txt"

        },

        {

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

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

            dest: "removed.txt",

            tag: ".removed-api.txt",

        },

    ]

}



java_library {