commit 737106a61b0ceb2a6b92e7734b04900b174addce
author Narayan Kamath <narayan@google.com> Thu Jul 16 10:10:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 16 10:10:28 2015 +0000
tree ba46dfb78ff9de716c140548abd08624aa184e55
parent a845514724664d34ef70803c329f93a1264530f6
parent 1ecfdf33ee593c0e80cee5e11f4c0a0fd0071233

am 1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"

* commit '1ecfdf33ee593c0e80cee5e11f4c0a0fd0071233':
  docs: Add an explicit dependency on libcore/Docs.mk

Android.mk

diff --git a/Android.mk b/Android.mk
index d9e4455..b147fb8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -729,7 +729,8 @@
 	$(foreach lib,$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib)-res,,COMMON))
 
 framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \
-    frameworks/base/docs/knowntags.txt
+    frameworks/base/docs/knowntags.txt \
+    libcore/Docs.mk
 
 samples_dir := development/samples/browseable