Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d807ead authored by Sorin Basca's avatar Sorin Basca Committed by Automerger Merge Worker
Browse files

Merge "Enable ds-docs-switched" am: 2e868b00 am: 120ef6b8 am: aa47f347 am: 13db1423 

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



Change-Id: I62b39b503c129778aea0bf000fd8abe7866c51ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5054c384 13db1423

ApiDocs.bp

+20 −21
Original line number Diff line number Diff line
@@ -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",