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

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

Merge "Change last-released filegroup" into rvc-dev am: de9867d3 am: d7145f2e am: 075efe18 

Change-Id: I373026613c7cc4da5d305ebadb8db62c9d034b1b
parents 8c460ac3 075efe18

ApiDocs.bp

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

        "api-versions-jars-dir",

    ],

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

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

    merge_annotations_dirs: [

        "metalava-manual",

    ],

StubLibraries.bp

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

    installable: false,

    annotations_enabled: true,

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

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

    merge_annotations_dirs: [

        "metalava-manual",

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

        },

        last_released: {

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

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

            removed_api_file: "api/removed.txt",

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

        },

        api_lint: {

            enabled: true,

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

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

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

        },

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

        },

        last_released: {

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

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

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

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

        },

        api_lint: {

            enabled: true,

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

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

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

        },

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

        },

        last_released: {

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

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

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

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

        },

        api_lint: {

            enabled: true,

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

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

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

        },

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

    sdk_version: "core_platform",

    annotations_enabled: true,

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

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

    merge_annotations_dirs: [

        "metalava-manual",

    ],

services/Android.bp

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

        },

        last_released: {

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

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

            removed_api_file: "api/removed.txt",

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

        },

        api_lint: {

            enabled: true,

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

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

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

        },

    },