summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2015-07-16 10:10:28 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-16 10:10:28 +0000
commit737106a61b0ceb2a6b92e7734b04900b174addce (patch)
treeba46dfb78ff9de716c140548abd08624aa184e55
parenta845514724664d34ef70803c329f93a1264530f6 (diff)
parent1ecfdf33ee593c0e80cee5e11f4c0a0fd0071233 (diff)
am 1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '1ecfdf33ee593c0e80cee5e11f4c0a0fd0071233': docs: Add an explicit dependency on libcore/Docs.mk
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index d9e44554176f..b147fb86b771 100644
--- a/Android.mk
+++ b/Android.mk
@@ -729,7 +729,8 @@ framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \
$(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