diff options
| author | 2024-12-11 00:52:14 +0000 | |
|---|---|---|
| committer | 2024-12-11 00:52:14 +0000 | |
| commit | 187b6d60c37230358bd709a1050e38b1dc43ee61 (patch) | |
| tree | 9dba5cf73a8c64bde5ca09d13633a0f5848fb9ab /api/ApiDocs.bp | |
| parent | 7fbf51cbbc6a20469c0e34476f0fa3ac06c3d93a (diff) | |
| parent | c05bf80ae423132c9d8ecdac19a272503519d99d (diff) | |
Merge "Pass previously released API when generating framework doc stubs" into main am: ab104e2936 am: c05bf80ae4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3400045
Change-Id: I16fef93d7c53820186fbed3e43636c6530eba473
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 89351fd47ff8..03fb44fd8145 100644 --- a/api/ApiDocs.bp +++ b/api/ApiDocs.bp @@ -130,6 +130,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: { @@ -138,13 +142,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", + }, + }, } ///////////////////////////////////////////////////////////////////// |