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

Commit d772be2a authored by Paul Duffin's avatar Paul Duffin
Browse files

Pass previously released API when generating framework doc stubs 

Previously, the previously released APIs were not passed when generated
`framework-doc-stubs` and `framework-doc-system-stubs`. That meant that
flagged APIs that were reverted would be removed even if they had
previously been released. This change fixes that by passing the
previously released API.

Bug: 379918901
Test: m framework-doc-stubs framework-doc-system-stubs
      # Before this change they did not included ApplicationStartInfo
      # After this change they both did and it was correctly tagged
      # with @apiSince 35.
Change-Id: I2d02874d32fd62d166d66a66d8f72eed9f657511
parent 33c1c8b3

api/ApiDocs.bp

+31 −1
Original line number Diff line number Diff line
@@ -129,6 +129,10 @@ droidstubs { 
droidstubs {

    name: "framework-doc-stubs",

    defaults: ["android-non-updatable-doc-stubs-defaults"],

    flags: [

        // Ignore any compatibility errors, see check_api.last_released below for more information.

        "--hide-category Compatibility",

    ],

    srcs: [":all-modules-public-stubs-source-exportable"],

    api_levels_module: "api_versions_public",

    aidl: {
@@ -137,13 +141,39 @@ droidstubs { 
            "packages/modules/Media/apex/aidl/stable",

        ],

    },



    // Pass the previously released API to support reverting flagged APIs. Without this, reverting

    // a flagged API will cause it to be removed, even if it had previously been released. This

    // has the side effect of causing compatibility issues to be reported but they are already

    // checked elsewhere so they will be ignored, see `--hide-category Compatibility` above.

    check_api: {

        last_released: {

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

            removed_api_file: ":android-removed.api.combined.public.latest",

        },

    },

}



droidstubs {

    name: "framework-doc-system-stubs",

    defaults: ["framework-doc-stubs-sources-default"],

    flags: ["--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)"],

    flags: [

        "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",

        // Ignore any compatibility errors, see check_api.last_released below for more information.

        "--hide-category Compatibility",

    ],

    api_levels_module: "api_versions_system",



    // Pass the previously released API to support reverting flagged APIs. Without this, reverting

    // a flagged API will cause it to be removed, even if it had previously been released. This

    // has the side effect of causing compatibility issues to be reported but they are already

    // checked elsewhere so they will be ignored, see `--hide-category Compatibility` above.

    check_api: {

        last_released: {

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

            removed_api_file: ":android-removed.api.combined.system.latest",

        },

    },

}



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