commit 834be811899ab0280a6a73d81c02b0106208ec1f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 31 15:24:11 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 31 15:24:11 2017 +0000
tree 222f0baa9c60447399e942eda31a1263eaacafb6
parent b519569eb30cbda364ddef39bd55cef8f8e202d2
parent 72d359f227bc24afd010f26310f2e0d3ec7dc230

Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"

Android.mk

diff --git a/Android.mk b/Android.mk
index 2b12416..14819d9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -942,7 +942,8 @@
 framework_docs_LOCAL_INTERMEDIATE_SOURCES := \
 	$(framework_res_source_path)/android/R.java \
 	$(framework_res_source_path)/android/Manifest.java \
-	$(framework_res_source_path)/com/android/internal/R.java
+	$(framework_res_source_path)/com/android/internal/R.java \
+	$(patsubst $(TARGET_OUT_COMMON_INTERMEDIATES)/%,%,$(libcore_to_document_generated))
 
 framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \
 	core-oj \
@@ -1014,7 +1015,7 @@
 
 framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \
     frameworks/base/docs/knowntags.txt \
-    libcore/Docs.mk
+    $(libcore_to_document_generated)
 
 samples_dir := development/samples/browseable