From fb790877a0dc0c1c10e368e00af28114d2f2a967 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 17 May 2011 14:48:10 -0700 Subject: [PATCH] Fix use of intermediates in droiddoc Droiddoc should be product-independent. Change-Id: I23ac746330ce7cd0ad47d49c01dcfa824228d60c --- core/droiddoc.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 505d1273d8..2642626f74 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -82,13 +82,13 @@ $(full_target): PRIVATE_CLASSPATH := $(subst $(space),:,$(full_java_libs)) endif # !LOCAL_IS_HOST_MODULE -intermediates := $(call local-intermediates-dir) +intermediates.COMMON := $(call local-intermediates-dir,COMMON) $(full_target): PRIVATE_SOURCE_PATH := $(call normalize-path-list,$(LOCAL_DROIDDOC_SOURCE_PATH)) $(full_target): PRIVATE_JAVA_FILES := $(filter %.java,$(full_src_files)) $(full_target): PRIVATE_JAVA_FILES += $(addprefix $($(my_prefix)OUT_COMMON_INTERMEDIATES)/, $(filter %.java,$(LOCAL_INTERMEDIATE_SOURCES))) -$(full_target): PRIVATE_SOURCE_INTERMEDIATES_DIR := $(intermediates)/src -$(full_target): PRIVATE_SRC_LIST_FILE := $(intermediates)/droiddoc-src-list +$(full_target): PRIVATE_SOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/src +$(full_target): PRIVATE_SRC_LIST_FILE := $(intermediates.COMMON)/droiddoc-src-list ifneq ($(strip $(LOCAL_ADDITIONAL_JAVA_DIR)),) $(full_target): PRIVATE_ADDITIONAL_JAVA_DIR := $(LOCAL_ADDITIONAL_JAVA_DIR)