am 34eb13de
: am 18a1a50f
: am 9c2336e0
: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Android Git Automerger (2) and Dirk Dougherty (1) * commit '34eb13de682225fbb6453f606ed75b3460c0a57d': Add new droiddoc option for project-specific secondary html input/output paths.
This commit is contained in:
commit
f0b7415e6e
1 changed files with 6 additions and 0 deletions
|
@ -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)) \
|
||||
|
|
Loading…
Reference in a new issue