diff options
author | Dan Willemsen <dwillemsen@google.com> | 2020-04-20 22:32:45 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2020-04-20 22:43:18 -0700 |
commit | cece97c664f573508f24a7e1ccf8ebc68068f928 (patch) | |
tree | e5d5f84c23d480e38529c9856d8bad96b98883f5 /ApiDocs.bp | |
parent | ca4379a86670ee67f3563a0e6cb8e91c1411a5c1 (diff) |
Remove proofread files that aren't created
These would cause these actions (and any that depended upon them) to
re-run during every incremental build. These now produce warnings:
ninja: output file missing after successful execution: out/soong/.intermediates/frameworks/base/ds-ref-navtree-docs/android_common/ds-ref-navtree-docs-proofrerad.txt
It turns out that the -proofread argument to doclava is ignored with the
following argument combinations:
* -static -devsite
* -navtreeonly
Test: m docs; m docs (nothing to do)
Change-Id: I21b939951f5a2f33914e9fc9414df8206091d262
Diffstat (limited to 'ApiDocs.bp')
-rw-r--r-- | ApiDocs.bp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index cac987c0be13..bd4a32bfab7a 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -320,7 +320,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 +340,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 { @@ -358,10 +358,10 @@ java_genrule { 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)", + "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 +373,6 @@ droiddoc { hdf: [ "android.whichdoc online", ], - proofread_file: "ds-static-docs-proofrerad.txt", args: framework_docs_only_args + " -staticonly " + " -toroot / " + @@ -390,7 +389,6 @@ droiddoc { hdf: [ "android.whichdoc online", ], - proofread_file: "ds-ref-navtree-docs-proofrerad.txt", args: framework_docs_only_args + " -toroot / " + " -atLinksNavtree " + @@ -437,4 +435,3 @@ droiddoc { " -referenceonly " + " -title \"Android SDK - Including hidden APIs.\"", } - |