Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0f58f95 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am f0b7415e: am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option... 

am f0b7415e: am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.

# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit 'f0b7415e':
  Add new droiddoc option for project-specific secondary html input/output paths.
parents b4f79a40 f0b7415e

core/droiddoc.mk

+6 −0
Original line number Diff line number Diff line
@@ -149,6 +149,11 @@ else 
$(full_target): PRIVATE_DROIDDOC_HTML_DIR :=

html_dir_files :=

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)) \