X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=core%2Fdroiddoc.mk;h=83cf40456ed97ae2f0c6c796a620937449020645;hb=bb999c493b3b2b23b9820363a2e39e0a852ac24b;hp=ce0c46eea99105c7e867ec9db27f7032713b861c;hpb=aaf22c8dd864c9bb8944106d4196969e950d2163;p=android-x86%2Fbuild.git diff --git a/core/droiddoc.mk b/core/droiddoc.mk index ce0c46eea..83cf40456 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -22,9 +22,9 @@ LOCAL_IS_HOST_MODULE := $(call true-or-empty,$(LOCAL_IS_HOST_MODULE)) ifeq ($(LOCAL_IS_HOST_MODULE),true) -my_prefix:=HOST_ +my_prefix := HOST_ else -my_prefix:=TARGET_ +my_prefix := TARGET_ endif LOCAL_MODULE_CLASS := $(strip $(LOCAL_MODULE_CLASS)) @@ -152,6 +152,11 @@ $(full_target): PRIVATE_ADDITIONAL_HTML_DIR := -htmldir2 $(LOCAL_PATH)/$(LOCAL_A else $(full_target): PRIVATE_ADDITIONAL_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)