commit 1d5ed780720be96ab0765815b3694748e0f098cd
author Colin Cross <ccross@android.com> Thu Aug 09 20:19:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 09 20:19:32 2018 +0000
tree a2ff04d29d99a85ca1003ac3156bf0eb0002471c
parent 61f32128aa8e5dcd64a94b932575e161639a7e1c
parent 5fa9d6f445d417f25f5b1763c7cef2ad5c368cb6

Merge "Use soong_droiddoc_prebuilt.mk"

java/androidmk.go

diff --git a/java/androidmk.go b/java/androidmk.go
index 14e9fec..04e92c9 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -285,7 +285,7 @@
 	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 @@
 	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) {