Fix droiddoc builds for second htmldir. (1151ef4f) · Commits · e / os / android_build

core/droiddoc.mk

+8 −3

Original line number	Diff line number	Diff line
		@@ -144,10 +144,13 @@ $(full_target): PRIVATE_OUT_ASSET_DIR := $(out_dir)/$(LOCAL_DROIDDOC_ASSET_DIR)
		$(full_target): PRIVATE_OUT_CUSTOM_ASSET_DIR := $(out_dir)/$(LOCAL_DROIDDOC_CUSTOM_ASSET_DIR)
		ifneq ($(strip $(LOCAL_DROIDDOC_HTML_DIR)),)
		$(full_target): PRIVATE_DROIDDOC_HTML_DIR := -htmldir $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR)
		html_dir_files := $(shell find $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) -type f)
		else
		$(full_target): PRIVATE_DROIDDOC_HTML_DIR :=
		html_dir_files :=
		endif
		ifneq ($(strip $(LOCAL_ADDITIONAL_HTML_DIR)),)
		$(full_target): PRIVATE_ADDITIONAL_HTML_DIR := -htmldir2 $(LOCAL_PATH)/$(LOCAL_ADDITIONAL_HTML_DIR)
		else
		$(full_target): PRIVATE_ADDITIONAL_HTML_DIR :=
		endif
		ifneq ($(strip $(LOCAL_ADDITIONAL_HTML_DIR)),)
		$(full_target): PRIVATE_ADDITIONAL_HTML_DIR := -htmldir2 $(LOCAL_PATH)/$(LOCAL_ADDITIONAL_HTML_DIR)
		@@ -158,6 +161,8 @@ endif
		# TODO: not clear if this is used any more
		$(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)

		html_dir_files := $(shell find $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) -type f)

		$(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_files) $(full_java_lib_deps) $(LOCAL_ADDITIONAL_DEPENDENCIES)
		@echo Docs droiddoc: $(PRIVATE_OUT_DIR)
		$(hide) mkdir -p $(dir $(full_target))