diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-02-01 13:27:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-01 13:27:53 -0800 |
| commit | 18a1a50f981449bb3dbd6bab3ee2502b51259fd7 (patch) | |
| tree | fa56fa75901abc05d0704ce2f8b44e221fb86b26 /core | |
| parent | 9c3033ce0e099b8722cb8524ee52b6bce2e46506 (diff) | |
| parent | 9c2336e073cef13a5237965dc7d5fcdb0091be34 (diff) | |
| download | build-18a1a50f981449bb3dbd6bab3ee2502b51259fd7.zip build-18a1a50f981449bb3dbd6bab3ee2502b51259fd7.tar.gz build-18a1a50f981449bb3dbd6bab3ee2502b51259fd7.tar.bz2 | |
am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Dirk Dougherty
* commit '9c2336e073cef13a5237965dc7d5fcdb0091be34':
Add new droiddoc option for project-specific secondary html input/output paths.
Diffstat (limited to 'core')
| -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)) \ |