diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-02-05 16:45:05 -0800 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2013-02-05 17:07:12 -0800 |
| commit | 1151ef4f853d9425768e1a997439b8e1cead4ccf (patch) | |
| tree | 1c645bce5a5524398a53f59096dc8faca99004f3 /core/droiddoc.mk | |
| parent | 36b46fd13c905357972c73a89a637abcd79db4b1 (diff) | |
| download | build-1151ef4f853d9425768e1a997439b8e1cead4ccf.zip build-1151ef4f853d9425768e1a997439b8e1cead4ccf.tar.gz build-1151ef4f853d9425768e1a997439b8e1cead4ccf.tar.bz2 | |
Fix droiddoc builds for second htmldir.
Change-Id: If8e73508babf5e0cb4be271b4aef69317bb6467e
Diffstat (limited to 'core/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 620001b..f29aaa7 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -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 := +$(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) @@ -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)) |