diff options
Diffstat (limited to 'ApiDocs.bp')
| -rw-r--r-- | ApiDocs.bp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index a81342a5160f..ada80bbc9874 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -65,9 +65,9 @@ stubs_defaults { "test-base/src/**/*.java", ":opt-telephony-srcs", ":opt-net-voip-srcs", - ":art-module-public-api-stubs-source", + ":art.module.public.api{.public.stubs.source}", ":conscrypt.module.public.api{.public.stubs.source}", - ":android_icu4j_public_api_files", + ":i18n.module.public.api{.public.stubs.source}", "test-mock/src/**/*.java", "test-runner/src/**/*.java", ], @@ -91,7 +91,9 @@ droidstubs { arg_files: [ "core/res/AndroidManifest.xml", ], - args: metalava_framework_docs_args, + args: metalava_framework_docs_args + + // Needed for hidden libcore annotations for now. + " --ignore-classes-on-classpath ", write_sdk_values: true, } @@ -101,7 +103,10 @@ droidstubs { arg_files: [ "core/res/AndroidManifest.xml", ], - args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", + args: metalava_framework_docs_args + + // Needed for hidden libcore annotations for now. + " --ignore-classes-on-classpath " + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", write_sdk_values: true, } @@ -131,7 +136,7 @@ doc_defaults { ], knowntags: [ "docs/knowntags.txt", - ":known-oj-tags", + ":art.module.public.api{.doctags}", ], custom_template: "droiddoc-templates-sdk", resourcesdir: "docs/html/reference/images/", @@ -150,12 +155,10 @@ doc_defaults { ":current-support-api", ":current-androidx-api", ], - create_stubs: false, } doc_defaults { name: "framework-dokka-docs-default", - create_stubs: false, } droiddoc { @@ -320,7 +323,7 @@ droiddoc { ":framework-doc-stubs", ], args: "-noJdkLink -links https://kotlinlang.org/api/latest/jvm/stdlib/^external/dokka/package-list " + - "-noStdlibLink", + "-noStdlibLink", proofread_file: "ds-dokka-proofread.txt", dokka_enabled: true, } @@ -340,7 +343,7 @@ java_genrule { targets: ["docs"], }, cmd: "$(location zip2zip) -i $(location :ds-docs-kt{.docs.zip}) -o $(genDir)/ds-docs-kt-moved.zip **/*:en/reference/kotlin && " + - "$(location merge_zips) $(out) $(location :ds-docs-java{.docs.zip}) $(genDir)/ds-docs-kt-moved.zip", + "$(location merge_zips) $(out) $(location :ds-docs-java{.docs.zip}) $(genDir)/ds-docs-kt-moved.zip", } java_genrule { @@ -357,11 +360,11 @@ java_genrule { dist: { targets: ["docs"], }, - cmd: "unzip $(location :ds-docs-java{.docs.zip}) -d $(genDir) && " + - "unzip $(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) && " + - "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", + 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 { @@ -373,7 +376,6 @@ droiddoc { hdf: [ "android.whichdoc online", ], - proofread_file: "ds-static-docs-proofrerad.txt", args: framework_docs_only_args + " -staticonly " + " -toroot / " + @@ -390,7 +392,6 @@ droiddoc { hdf: [ "android.whichdoc online", ], - proofread_file: "ds-ref-navtree-docs-proofrerad.txt", args: framework_docs_only_args + " -toroot / " + " -atLinksNavtree " + @@ -437,4 +438,3 @@ droiddoc { " -referenceonly " + " -title \"Android SDK - Including hidden APIs.\"", } - |