Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir" am: cb07cb1aa7
am: cf8ac2a820
Change-Id: Ieef27917a409ff8682cb2159341876480b099d4b
This commit is contained in:
commit
2bd2a9d630
|
@ -130,7 +130,13 @@ ifneq ($(strip $(LOCAL_DROIDDOC_USE_STANDARD_DOCLET)),true)
|
|||
##
|
||||
|
||||
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) \
|
||||
|
|
Loading…
Reference in New Issue