diff options
| author | 2023-03-15 09:47:59 +0000 | |
|---|---|---|
| committer | 2023-03-15 09:47:59 +0000 | |
| commit | 13db1423ba3d51f36f544d8066da38cb4499dea6 (patch) | |
| tree | 8f8813b8c1014f181431cce1d36d7f115f92993d | |
| parent | c6f845abc0639c9a5f358d82fd60bfb42c9a3802 (diff) | |
| parent | aa47f3474b7439bf44b7a77c1d843040156cd84a (diff) | |
Merge "Enable ds-docs-switched" am: 2e868b0030 am: 120ef6b8a9 am: aa47f3474b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2485596
Change-Id: I814a63dce6e8dd7dc0eac507acf00ef4adb6b2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | ApiDocs.bp | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index 90b6603b8787..a46ecce5c721 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -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", |