Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf8ac2a8 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir" 

am: cb07cb1a

Change-Id: I984922749f69dad7bb04052655d14ad62316cd8d
parents 6da0f9c8 cb07cb1a

core/droiddoc.mk

+7 −1
Original line number Diff line number Diff line
@@ -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) \