diff options
| author | 2024-12-11 00:19:26 +0000 | |
|---|---|---|
| committer | 2024-12-11 00:19:26 +0000 | |
| commit | c05bf80ae423132c9d8ecdac19a272503519d99d (patch) | |
| tree | d8b33528637aae2a3232052ede6dfb2d62b5873a /api/ApiDocs.bp | |
| parent | af8b7595b8a9b7c4b101d13a65478fa5800f6e3d (diff) | |
| parent | ab104e293605f9d87b27e7ed182cf5498555594d (diff) | |
Merge "Pass previously released API when generating framework doc stubs" into main am: ab104e2936
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3400045
Change-Id: If456aaa14ba5bc2ca468a8f813702cca88dc93bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/ApiDocs.bp')
| -rw-r--r-- | api/ApiDocs.bp | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/api/ApiDocs.bp b/api/ApiDocs.bp index 1ebe0cdfabd7..796c8412b26c 100644 --- a/api/ApiDocs.bp +++ b/api/ApiDocs.bp @@ -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", + }, + }, } ///////////////////////////////////////////////////////////////////// |