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

Merge "Disable ds-docs-switched" am: 673132ad6b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2276633

Change-Id: Ia4f731469be3ece09c3f72c223aa5e66227b8b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sorin Basca
2023-02-02 21:09:54 +00:00
committed by Automerger Merge Worker
parent 9f0f23a883 673132ad6b
commit cb01838b8b
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ApiDocs.bp
View File

@@ -422,26 +422,27 @@ java_genrule {
"$(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 { // Disable doc generation until Doclava is migrated to JDK 17 (b/240421555).
name: "ds-docs-switched", // java_genrule {
tools: [ // name: "ds-docs-switched",
"switcher4", // tools: [
"soong_zip", // "switcher4",
], // "soong_zip",
srcs: [ // ],
":ds-docs-java{.docs.zip}", // srcs: [
":ds-docs-kt{.docs.zip}", // ":ds-docs-java{.docs.zip}",
], // ":ds-docs-kt{.docs.zip}",
out: ["ds-docs-switched.zip"], // ],
dist: { // out: ["ds-docs-switched.zip"],
targets: ["docs"], // 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 && " + // cmd: "unzip -q $(location :ds-docs-java{.docs.zip}) -d $(genDir) && " +
"SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " + // "unzip -q $(location :ds-docs-kt{.docs.zip}) -d $(genDir)/en/reference/kotlin && " +
"(cd $(genDir)/en/reference && $$SWITCHER --work platform) > /dev/null && " + // "SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " +
"$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", // "(cd $(genDir)/en/reference && $$SWITCHER --work platform) > /dev/null && " +
} // "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)",
// }
droiddoc { droiddoc {
name: "ds-static-docs", name: "ds-static-docs",