diff options
| author | Bill Napier <napier@google.com> | 2010-08-27 10:10:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-27 10:10:52 -0700 |
| commit | a6e0841beac4db8bbc75ed9ab587fc1099d6dced (patch) | |
| tree | ed576856480cd05f663b636d9f03265d4f373563 | |
| parent | 1ddbbfbbf35ce613f2d8fd8a9743b68896874315 (diff) | |
| parent | 9a0e98ac478d8ca61011556e22af13e05d94f8e0 (diff) | |
| download | build-a6e0841beac4db8bbc75ed9ab587fc1099d6dced.zip build-a6e0841beac4db8bbc75ed9ab587fc1099d6dced.tar.gz build-a6e0841beac4db8bbc75ed9ab587fc1099d6dced.tar.bz2 | |
Merge "Revert "Fix MonkeyRunner SDK documentation generation.""
| -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 96411f5..3703d6b 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 := $(foreach dir,$(LOCAL_DROIDDOC_HTML_DIR),-htmldir $(dir)) +$(full_target): PRIVATE_DROIDDOC_HTML_DIR := -htmldir $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_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 := $(foreach dir,$(LOCAL_DROIDDOC_HTML_DIR),$(shell test -d $(dir) && find $(dir) -type f)) +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) @echo Docs droiddoc: $(PRIVATE_OUT_DIR) |