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

Commit 23571fd7 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 7cd663f0: Merge "Fix html_dir_files in droiddoc.mk" 

* commit '7cd663f0':
  Fix html_dir_files in droiddoc.mk
parents 18a53d29 7cd663f0

core/droiddoc.mk

+5 −8
Original line number Diff line number Diff line
@@ -131,18 +131,17 @@ $(full_target): PRIVATE_CUSTOM_TEMPLATE_DIR := $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_ 
$(full_target): PRIVATE_IN_CUSTOM_ASSET_DIR := $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR)/$(LOCAL_DROIDDOC_CUSTOM_ASSET_DIR)

$(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)



html_dir_files :=

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 :=

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)

html_dir_files += $(shell find $(LOCAL_PATH)/$(LOCAL_ADDITIONAL_HTML_DIR) -type f)

else

$(full_target): PRIVATE_ADDITIONAL_HTML_DIR :=

endif
@@ -150,8 +149,6 @@ 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 $@)