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

Merge "Enable ds-docs-switched" am: 2e868b0030

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

Change-Id: I75aa66ea6565a6e1788d55c38f430581a862c27e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sorin Basca
2023-03-15 08:16:55 +00:00
committed by Automerger Merge Worker
parent e6f3688104 2e868b0030
commit 120ef6b8a9
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", "$(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 {
// java_genrule { name: "ds-docs-switched",
// name: "ds-docs-switched", tools: [
// tools: [ "switcher4",
// "switcher4", "soong_zip",
// "soong_zip", ],
// ], srcs: [
// srcs: [ ":ds-docs-java{.docs.zip}",
// ":ds-docs-java{.docs.zip}", ":ds-docs-kt{.docs.zip}",
// ":ds-docs-kt{.docs.zip}", ],
// ], out: ["ds-docs-switched.zip"],
// out: ["ds-docs-switched.zip"], dist: {
// dist: { 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 {
name: "ds-static-docs", name: "ds-static-docs",