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

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

Merge "Dist more API txt files" am: 45b39d81

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e4c654503a6fda7a8ccbdf7459d75c4f445a7ba
parents b2cf9573 45b39d81
Loading
Loading
Loading
Loading
+68 −5
Original line number Original line Diff line number Diff line
@@ -120,6 +120,20 @@ droidstubs {
            new_since: ":android-non-updatable.api.public.latest",
            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 =
priv_apps =
@@ -159,6 +173,20 @@ droidstubs {
            baseline_file: "core/api/system-lint-baseline.txt",
            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 {
droidstubs {
@@ -175,11 +203,32 @@ droidstubs {
            baseline_file: "core/api/test-lint-baseline.txt",
            baseline_file: "core/api/test-lint-baseline.txt",
        },
        },
    },
    },
    dist: {
    dists: [
        {
            targets: ["sdk", "win_sdk"],
            targets: ["sdk", "win_sdk"],
            dir: "apistubs/android/test/api",
            dir: "apistubs/android/test/api",
            dest: "android.txt",
            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 {
droidstubs {
@@ -200,6 +249,20 @@ droidstubs {
            new_since: ":android-non-updatable.api.module-lib.latest",
            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",
        },
    ],
}
}


/////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////
+18 −12
Original line number Original line Diff line number Diff line
@@ -50,10 +50,7 @@ genrule {
            dest: "current.txt",
            dest: "current.txt",
        },
        },
        {
        {
            targets: [
            targets: ["sdk", "win_sdk"],
                "sdk",
                "win_sdk",
            ],
            dir: "apistubs/android/public/api",
            dir: "apistubs/android/public/api",
            dest: "android.txt",
            dest: "android.txt",
        },
        },
@@ -106,6 +103,11 @@ genrule {
            dir: "api",
            dir: "api",
            dest: "removed.txt",
            dest: "removed.txt",
        },
        },
        {
            targets: ["sdk", "win_sdk"],
            dir: "apistubs/android/public/api",
            dest: "removed.txt",
        },
    ],
    ],
}
}


@@ -131,10 +133,7 @@ genrule {
            dest: "system-current.txt",
            dest: "system-current.txt",
        },
        },
        {
        {
            targets: [
            targets: ["sdk", "win_sdk"],
                "sdk",
                "win_sdk",
            ],
            dir: "apistubs/android/system/api",
            dir: "apistubs/android/system/api",
            dest: "android.txt",
            dest: "android.txt",
        },
        },
@@ -163,6 +162,11 @@ genrule {
            dir: "api",
            dir: "api",
            dest: "system-removed.txt",
            dest: "system-removed.txt",
        },
        },
        {
            targets: ["sdk", "win_sdk"],
            dir: "apistubs/android/system/api",
            dest: "removed.txt",
        },
    ],
    ],
    visibility: ["//visibility:public"],
    visibility: ["//visibility:public"],
}
}
@@ -189,10 +193,7 @@ genrule {
            dest: "module-lib-current.txt",
            dest: "module-lib-current.txt",
        },
        },
        {
        {
            targets: [
            targets: ["sdk", "win_sdk"],
                "sdk",
                "win_sdk",
            ],
            dir: "apistubs/android/module-lib/api",
            dir: "apistubs/android/module-lib/api",
            dest: "android.txt",
            dest: "android.txt",
        },
        },
@@ -220,6 +221,11 @@ genrule {
            dir: "api",
            dir: "api",
            dest: "module-lib-removed.txt",
            dest: "module-lib-removed.txt",
        },
        },
        {
            targets: ["sdk", "win_sdk"],
            dir: "apistubs/android/module-lib/api",
            dest: "removed.txt",
        },
    ],
    ],
}
}


+14 −5
Original line number Original line Diff line number Diff line
@@ -147,11 +147,20 @@ droidstubs {
            baseline_file: "api/lint-baseline.txt",
            baseline_file: "api/lint-baseline.txt",
        },
        },
    },
    },
    dist: {
    dists: [
        {
            targets: ["sdk", "win_sdk"],
            targets: ["sdk", "win_sdk"],
            dir: "apistubs/android/system-server/api",
            dir: "apistubs/android/system-server/api",
            dest: "android.txt",
            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 {
java_library {