commit cf8ac2a8209bd2080f0fae1a9ebafdce9a4551b4
author Dan Willemsen <dwillemsen@google.com> Tue Jun 13 15:25:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 13 15:25:54 2017 +0000
tree c280189bcece0b8c40f67ad20918036dc16e0dc6
parent 6da0f9c8fd4f1c07bbc7cc18917ca931f8e980a5
parent cb07cb1aa7b7e27365e2600dc688aa6097a2ea6c

Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir"
am: cb07cb1aa7

Change-Id: I984922749f69dad7bb04052655d14ad62316cd8d

core/droiddoc.mk

diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 7e17a13..eb12630 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -130,7 +130,13 @@
 ##
 
 droiddoc_templates := \
-    $(sort $(shell find $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -type f))
+    $(sort $(shell find $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -type f $(if $(ALLOW_MISSING_DEPENDENCIES),2>/dev/null)))
+
+ifdef ALLOW_MISSING_DEPENDENCIES
+  ifndef droiddoc_templates
+    droiddoc_templates := $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR)
+  endif
+endif
 
 droiddoc := \
 	$(HOST_JDK_TOOLS_JAR) \