Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove proofread files that aren't created"

Browse Source
This commit is contained in:
Treehugger Robot
2020-04-21 22:31:23 +00:00
committed by Gerrit Code Review
parent eed1c8dd79 cece97c664
commit 8a6beab15e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApiDocs.bp
View File

@@ -320,7 +320,7 @@ droiddoc {
":framework-doc-stubs", ":framework-doc-stubs",
], ],
args: "-noJdkLink -links https://kotlinlang.org/api/latest/jvm/stdlib/^external/dokka/package-list " + args: "-noJdkLink -links https://kotlinlang.org/api/latest/jvm/stdlib/^external/dokka/package-list " +
"-noStdlibLink", "-noStdlibLink",
proofread_file: "ds-dokka-proofread.txt", proofread_file: "ds-dokka-proofread.txt",
dokka_enabled: true, dokka_enabled: true,
} }
@@ -340,7 +340,7 @@ java_genrule {
targets: ["docs"], targets: ["docs"],
}, },
cmd: "$(location zip2zip) -i $(location :ds-docs-kt{.docs.zip}) -o $(genDir)/ds-docs-kt-moved.zip **/*:en/reference/kotlin && " + 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 { java_genrule {
@@ -358,10 +358,10 @@ java_genrule {
targets: ["docs"], targets: ["docs"],
}, },
cmd: "unzip -q $(location :ds-docs-java{.docs.zip}) -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 && " + "unzip -q $(location :ds-docs-kt{.docs.zip}) -d $(genDir)/en/reference/kotlin && " +
"SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " + "SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " +
"(cd $(genDir)/en/reference && $$SWITCHER --work platform) > /dev/null && " + "(cd $(genDir)/en/reference && $$SWITCHER --work platform) > /dev/null && " +
"$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)",
} }
droiddoc { droiddoc {
@@ -373,7 +373,6 @@ droiddoc {
hdf: [ hdf: [
"android.whichdoc online", "android.whichdoc online",
], ],
proofread_file: "ds-static-docs-proofrerad.txt",
args: framework_docs_only_args + args: framework_docs_only_args +
" -staticonly " + " -staticonly " +
" -toroot / " + " -toroot / " +
@@ -390,7 +389,6 @@ droiddoc {
hdf: [ hdf: [
"android.whichdoc online", "android.whichdoc online",
], ],
proofread_file: "ds-ref-navtree-docs-proofrerad.txt",
args: framework_docs_only_args + args: framework_docs_only_args +
" -toroot / " + " -toroot / " +
" -atLinksNavtree " + " -atLinksNavtree " +
@@ -437,4 +435,3 @@ droiddoc {
" -referenceonly " + " -referenceonly " +
" -title \"Android SDK - Including hidden APIs.\"", " -title \"Android SDK - Including hidden APIs.\"",
} }