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

Merge "Enable ds-docs-switched"

Browse Source
This commit is contained in:
Sorin Basca
2023-03-15 07:48:16 +00:00
committed by Gerrit Code Review
parent a3458cb1a3 2fd4b16499
commit 2e868b0030
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ApiDocs.bp
View File

@@ -422,27 +422,26 @@ java_genrule {
"$(location merge_zips) $(out) $(location :ds-docs-java{.docs.zip}) $(genDir)/ds-docs-kt-moved.zip",
}
// 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)",
// }
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",