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

Commit 1d5ed780 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Use soong_droiddoc_prebuilt.mk"

parents 61f32128 5fa9d6f4

java/androidmk.go

+2 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ func (jd *Javadoc) AndroidMk() android.AndroidMkData { 
	return android.AndroidMkData{

		Class:      "JAVA_LIBRARIES",

		OutputFile: android.OptionalPathForPath(jd.stubsSrcJar),

		Include:    "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",

		Include:    "$(BUILD_SYSTEM)/soong_droiddoc_prebuilt.mk",

		Extra: []android.AndroidMkExtraFunc{

			func(w io.Writer, outputFile android.Path) {

				if BoolDefault(jd.properties.Installable, true) {
@@ -303,7 +303,7 @@ func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData { 
	return android.AndroidMkData{

		Class:      "JAVA_LIBRARIES",

		OutputFile: android.OptionalPathForPath(ddoc.stubsSrcJar),

		Include:    "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",

		Include:    "$(BUILD_SYSTEM)/soong_droiddoc_prebuilt.mk",

		Extra: []android.AndroidMkExtraFunc{

			func(w io.Writer, outputFile android.Path) {

				if BoolDefault(ddoc.Javadoc.properties.Installable, true) {