diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-01-28 18:57:30 -0800 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2013-01-28 19:51:04 -0800 |
| commit | 9c2336e073cef13a5237965dc7d5fcdb0091be34 (patch) | |
| tree | c0cf99a67fc2bc36eb155295d56a469058cae360 /core/droiddoc.mk | |
| parent | dc6b4a591c62f72ee5fea1e3bdadd3584e1eb284 (diff) | |
| download | build-9c2336e073cef13a5237965dc7d5fcdb0091be34.zip build-9c2336e073cef13a5237965dc7d5fcdb0091be34.tar.gz build-9c2336e073cef13a5237965dc7d5fcdb0091be34.tar.bz2 | |
Add new droiddoc option for project-specific secondary html input/output paths.
Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
Diffstat (limited to 'core/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 9f42933..03a5011 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -147,6 +147,11 @@ $(full_target): PRIVATE_DROIDDOC_HTML_DIR := -htmldir $(LOCAL_PATH)/$(LOCAL_DROI 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 # TODO: not clear if this is used any more $(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH) @@ -168,6 +173,7 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f -docletpath $(PRIVATE_DOCLETPATH) \ -templatedir $(PRIVATE_CUSTOM_TEMPLATE_DIR) \ $(PRIVATE_DROIDDOC_HTML_DIR) \ + $(PRIVATE_ADDITIONAL_HTML_DIR) \ $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ |