openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: 2bd2a9d630

Change-Id: I9f6ab6d23b44056e1bfac8fbc94f19ab27241366
This commit is contained in:
Dan Willemsen 2017-06-13 15:33:55 +00:00 committed by android-build-merger
parent e1241a4b27 2bd2a9d630
commit 29c6fa06c9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/droiddoc.mk
View File

@ -130,7 +130,13 @@ ifneq ($(strip $(LOCAL_DROIDDOC_USE_STANDARD_DOCLET)),true)
## ##
droiddoc_templates := \ 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 := \ droiddoc := \
$(HOST_JDK_TOOLS_JAR) \ $(HOST_JDK_TOOLS_JAR) \