diff options
| author | Bill Napier <napier@google.com> | 2010-08-25 18:16:13 -0700 |
|---|---|---|
| committer | Bill Napier <napier@google.com> | 2010-08-25 18:16:13 -0700 |
| commit | b47386bb270ec8f8f007d4fc9f7823530b74fdac (patch) | |
| tree | d38c4f20071f7a230d4554448404ef6d2ddd40a8 /core/droiddoc.mk | |
| parent | 5d69f108f780eea1069c8e1c1ae11df99e352737 (diff) | |
| download | build-b47386bb270ec8f8f007d4fc9f7823530b74fdac.zip build-b47386bb270ec8f8f007d4fc9f7823530b74fdac.tar.gz build-b47386bb270ec8f8f007d4fc9f7823530b74fdac.tar.bz2 | |
Fix MonkeyRunner SDK documentation generation.
Turns out that find doesn't like being passed paths that don't exist, so
don't do that.
Change-Id: I155cf48625513d1bcbd29329f1949967889dc9cc
Diffstat (limited to 'core/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 3703d6b..96411f5 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -142,7 +142,7 @@ $(full_target): PRIVATE_IN_CUSTOM_ASSET_DIR := $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_ $(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) +$(full_target): PRIVATE_DROIDDOC_HTML_DIR := $(foreach dir,$(LOCAL_DROIDDOC_HTML_DIR),-htmldir $(dir)) else $(full_target): PRIVATE_DROIDDOC_HTML_DIR := endif @@ -150,7 +150,7 @@ 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) +html_dir_files := $(foreach dir,$(LOCAL_DROIDDOC_HTML_DIR),$(shell test -d $(dir) && find $(dir) -type f)) $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_files) $(full_java_lib_deps) @echo Docs droiddoc: $(PRIVATE_OUT_DIR) |