Merge "Update droiddoc with combined generation of Java and Kotlin docs" am:... (35b5db56) · Commits · e / os / android_frameworks_base

Android.bp

+58 −1

Original line number	Original line	Diff line number	Diff line
	@@ -934,6 +934,11 @@ doc_defaults {
	create_stubs: false,		create_stubs: false,
	}		}

			doc_defaults {
			name: "framework-dokka-docs-default",
			create_stubs: false,
			}

	stubs_defaults {		stubs_defaults {
	name: "metalava-api-stubs-default",		name: "metalava-api-stubs-default",
	srcs: [		srcs: [
	@@ -1106,7 +1111,7 @@ droiddoc {
	}		}

	droiddoc {		droiddoc {
	name: "ds-docs",		name: "ds-docs-java",
	defaults: ["framework-docs-default"],		defaults: ["framework-docs-default"],
	srcs: [		srcs: [
	":framework-doc-stubs",		":framework-doc-stubs",
	@@ -1134,6 +1139,58 @@ droiddoc {
	" -samplegroup Wearable -devsite -samplesdir development/samples/browseable ",		" -samplegroup Wearable -devsite -samplesdir development/samples/browseable ",
	}		}

			droiddoc {
			name: "ds-docs-kt",
			defaults: ["framework-dokka-docs-default"],
			srcs: [
			":framework-doc-stubs",
			],
			args: "-noJdkLink -links https://kotlinlang.org/api/latest/jvm/stdlib/^external/dokka/package-list " +
			"-noStdlibLink",
			proofread_file: "ds-dokka-proofread.txt",
			dokka_enabled: true,
			}

			java_genrule {
			name: "ds-docs",
			tools: [
			"zip2zip",
			"merge_zips",
			],
			srcs: [
			":ds-docs-java{.docs.zip}",
			":ds-docs-kt{.docs.zip}",
			],
			out: ["ds-docs.zip"],
			dist: {
			targets: ["docs"],
			},
			cmd: "$(location zip2zip) -i $(location :ds-docs-kt{.docs.zip}) -o $(genDir)/ds-docs-kt-moved.zip */:en/reference/kotlin && " +
			"$(location merge_zips) $(out) $(location :ds-docs-java{.docs.zip}) $(genDir)/ds-docs-kt-moved.zip",
			}

			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 $(location :ds-docs-java{.docs.zip}) -d $(genDir) && " +
			"unzip $(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) && " +
			"$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)",
			}


	droiddoc {		droiddoc {
	name: "ds-static-docs",		name: "ds-static-docs",
	defaults: ["framework-docs-default"],		defaults: ["framework-docs-default"],