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

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

diff --cc core/droiddoc.mk
index 383cafd,03a5011..620001b
--- 1/core/droiddoc.mk
--- 2/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@@ -144,11 -144,14 +144,16 @@@ $(full_target): PRIVATE_OUT_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 := -htmldir $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR)
 +html_dir_files := $(shell find $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) -type f)
  else
 -$(full_target): PRIVATE_DROIDDOC_HTML_DIR := 
 +$(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)