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

Commit f68ddeaa authored by Anton Hansson's avatar Anton Hansson
Browse files

Change last-released filegroup 

There were two different filegroups referencing the same last released
APIs. Delete the manually defined one and switch references over to use
the one defined by prebuilt_apis.

Bug: 155197156
Test: m
Change-Id: Ib15d2c08e6400546ca03de6bfd4e5cbcc938c992
Merged-In: Ib15d2c08e6400546ca03de6bfd4e5cbcc938c992
parent da8f7afd

ApiDocs.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ stubs_defaults { 
        "sdk-dir",

        "sdk-dir",

        "api-versions-jars-dir",

        "api-versions-jars-dir",

    ],

    ],

    previous_api: ":last-released-public-api",

    previous_api: ":android.api.public.latest",

    merge_annotations_dirs: [

    merge_annotations_dirs: [

        "metalava-manual",

        "metalava-manual",

    ],

    ],

StubLibraries.bp

+8 −8
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ stubs_defaults { 
    libs: ["framework-internal-utils"],

    libs: ["framework-internal-utils"],

    installable: false,

    installable: false,

    annotations_enabled: true,

    annotations_enabled: true,

    previous_api: ":last-released-public-api",

    previous_api: ":android.api.public.latest",

    merge_annotations_dirs: [

    merge_annotations_dirs: [

        "metalava-manual",

        "metalava-manual",

    ],

    ],
@@ -97,13 +97,13 @@ droidstubs { 
            removed_api_file: "api/removed.txt",

            removed_api_file: "api/removed.txt",

        },

        },

        last_released: {

        last_released: {

            api_file: ":last-released-public-api",

            api_file: ":android.api.public.latest",

            removed_api_file: "api/removed.txt",

            removed_api_file: "api/removed.txt",

            baseline_file: ":public-api-incompatibilities-with-last-released",

            baseline_file: ":public-api-incompatibilities-with-last-released",

        },

        },

        api_lint: {

        api_lint: {

            enabled: true,

            enabled: true,

            new_since: ":last-released-public-api",

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

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

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

        },

        },

    },

    },
@@ -139,13 +139,13 @@ droidstubs { 
            removed_api_file: "api/system-removed.txt",

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

        },

        },

        last_released: {

        last_released: {

            api_file: ":last-released-system-api",

            api_file: ":android.api.system.latest",

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

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

            baseline_file: ":system-api-incompatibilities-with-last-released"

            baseline_file: ":system-api-incompatibilities-with-last-released"

        },

        },

        api_lint: {

        api_lint: {

            enabled: true,

            enabled: true,

            new_since: ":last-released-system-api",

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

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

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

        },

        },

    },

    },
@@ -207,13 +207,13 @@ droidstubs { 
            removed_api_file: "api/module-lib-removed.txt",

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

        },

        },

        last_released: {

        last_released: {

            api_file: ":last-released-module-lib-api",

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

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

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

            baseline_file: ":module-lib-api-incompatibilities-with-last-released"

            baseline_file: ":module-lib-api-incompatibilities-with-last-released"

        },

        },

        api_lint: {

        api_lint: {

            enabled: true,

            enabled: true,

            new_since: ":last-released-module-lib-api",

            new_since: ":android.api.module-lib.latest",

            baseline_file: "api/module-lib-lint-baseline.txt",

            baseline_file: "api/module-lib-lint-baseline.txt",

        },

        },

    },

    },
@@ -314,7 +314,7 @@ droidstubs { 
    installable: false,

    installable: false,

    sdk_version: "core_platform",

    sdk_version: "core_platform",

    annotations_enabled: true,

    annotations_enabled: true,

    previous_api: ":last-released-public-api",

    previous_api: ":android.api.public.latest",

    merge_annotations_dirs: [

    merge_annotations_dirs: [

        "metalava-manual",

        "metalava-manual",

    ],

    ],

services/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -122,13 +122,13 @@ droidstubs { 
            removed_api_file: "api/removed.txt",

            removed_api_file: "api/removed.txt",

        },

        },

        last_released: {

        last_released: {

            api_file: ":last-released-system-server-api",

            api_file: ":android.api.system-server.latest",

            removed_api_file: "api/removed.txt",

            removed_api_file: "api/removed.txt",

            baseline_file: ":system-server-api-incompatibilities-with-last-released"

            baseline_file: ":system-server-api-incompatibilities-with-last-released"

        },

        },

        api_lint: {

        api_lint: {

            enabled: true,

            enabled: true,

            new_since: ":last-released-system-server-api",

            new_since: ":android.api.system-server.latest",

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

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

        },

        },

    },

    },