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

Commit 4eb44194 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Use soong_droiddoc_prebuilt.mk" am: 1d5ed780 am: 442a3d7e am: b61ff914 

am: 5b29bfd5

Change-Id: I52433fe66ddd84cc7916e635fa1b0b46135b22ee
parents e54c9411 5b29bfd5

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) {