diff options
Diffstat (limited to 'ApiDocs.bp')
| -rw-r--r-- | ApiDocs.bp | 95 |
1 files changed, 61 insertions, 34 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index 5ec107da8b94..90b6603b8787 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -122,16 +122,30 @@ droidstubs { } droidstubs { - name: "framework-doc-system-stubs", - defaults: ["framework-doc-stubs-sources-default"], + name: "android-non-updatable-doc-stubs-module-lib", + defaults: [ + "android-non-updatable-doc-stubs-defaults", + "module-classpath-stubs-defaults", + ], args: metalava_framework_docs_args + - " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", - api_levels_annotations_enabled: true, - api_levels_annotations_dirs: [ - "sdk-dir", - "api-versions-jars-dir", + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) " + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\\) ", + generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs. + write_sdk_values: false, +} + +droidstubs { + name: "android-non-updatable-doc-stubs-system-server", + defaults: [ + "android-non-updatable-doc-stubs-defaults", + "module-classpath-stubs-defaults", ], - api_levels_sdk_type: "system", + args: metalava_framework_docs_args + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) " + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\\) " + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\) ", + generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs. + write_sdk_values: false, } droidstubs { @@ -139,17 +153,28 @@ droidstubs { defaults: ["android-non-updatable-doc-stubs-defaults"], srcs: [":all-modules-public-stubs-source"], args: metalava_framework_docs_args, - api_levels_annotations_enabled: true, - api_levels_annotations_dirs: [ - "sdk-dir", - "api-versions-jars-dir", - ], + api_levels_module: "api_versions_public", aidl: { include_dirs: [ "packages/modules/Connectivity/framework/aidl-export", "packages/modules/Media/apex/aidl/stable", ], }, + extensions_info_file: ":sdk-extensions-info", +} + +droidstubs { + name: "framework-doc-system-stubs", + defaults: ["framework-doc-stubs-sources-default"], + args: metalava_framework_docs_args + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", + api_levels_annotations_enabled: true, + api_levels_annotations_dirs: [ + "sdk-dir", + "api-versions-jars-dir", + ], + api_levels_sdk_type: "system", + extensions_info_file: ":sdk-extensions-info", } ///////////////////////////////////////////////////////////////////// @@ -158,6 +183,7 @@ droidstubs { ///////////////////////////////////////////////////////////////////// framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " + + "-metalavaApiSince " + "-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " + "-overview $(location core/java/overview.html) " + // Federate Support Library references against local API file. @@ -349,7 +375,7 @@ droiddoc { ], proofread_file: "ds-docs-proofread.txt", args: framework_docs_only_args + - " -toroot / -yamlV2 -metalavaApiSince -samplegroup Admin " + + " -toroot / -yamlV2 -samplegroup Admin " + " -samplegroup Background " + " -samplegroup Connectivity " + " -samplegroup Content " + @@ -396,26 +422,27 @@ java_genrule { "$(location merge_zips) $(out) $(location :ds-docs-java{.docs.zip}) $(genDir)/ds-docs-kt-moved.zip", } -java_genrule { - name: "ds-docs-switched", - tools: [ - "switcher4", - "soong_zip", - ], - srcs: [ - ":ds-docs-java{.docs.zip}", - ":ds-docs-kt{.docs.zip}", - ], - out: ["ds-docs-switched.zip"], - dist: { - targets: ["docs"], - }, - cmd: "unzip -q $(location :ds-docs-java{.docs.zip}) -d $(genDir) && " + - "unzip -q $(location :ds-docs-kt{.docs.zip}) -d $(genDir)/en/reference/kotlin && " + - "SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " + - "(cd $(genDir)/en/reference && $$SWITCHER --work platform) > /dev/null && " + - "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", -} +// Disable doc generation until Doclava is migrated to JDK 17 (b/240421555). +// java_genrule { +// name: "ds-docs-switched", +// tools: [ +// "switcher4", +// "soong_zip", +// ], +// srcs: [ +// ":ds-docs-java{.docs.zip}", +// ":ds-docs-kt{.docs.zip}", +// ], +// out: ["ds-docs-switched.zip"], +// dist: { +// targets: ["docs"], +// }, +// cmd: "unzip -q $(location :ds-docs-java{.docs.zip}) -d $(genDir) && " + +// "unzip -q $(location :ds-docs-kt{.docs.zip}) -d $(genDir)/en/reference/kotlin && " + +// "SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " + +// "(cd $(genDir)/en/reference && $$SWITCHER --work platform) > /dev/null && " + +// "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", +// } droiddoc { name: "ds-static-docs", |