From ad7809bba403f3cf4f8bc5d859a2f9b959159f82 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 7 Jul 2014 16:43:49 -0700 Subject: Fix host java doc by referring to the correct classpath. In droiddoc for host, we don't generate classes.jar for LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead. This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in base_rules.mk. Bug: 9176318 Change-Id: If7460b30ca5da28743487d66da0029a44108d556 --- core/droiddoc.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/droiddoc.mk') diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 90ef0b3f4..ecfe3dce7 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -53,6 +53,10 @@ endif ifeq ($(LOCAL_IS_HOST_MODULE),true) $(full_target): PRIVATE_BOOTCLASSPATH := +full_java_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,\ + $(addsuffix $(COMMON_JAVA_PACKAGE_SUFFIX),$(LOCAL_JAVA_LIBRARIES))) +full_java_lib_deps := $(full_java_libs) + else ifneq ($(LOCAL_SDK_VERSION),) @@ -70,11 +74,10 @@ else endif # LOCAL_SDK_VERSION LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES)) +full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES)) $(LOCAL_CLASSPATH) +full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES)) $(LOCAL_CLASSPATH) endif # !LOCAL_IS_HOST_MODULE -full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) $(LOCAL_CLASSPATH) -full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) $(LOCAL_CLASSPATH) - $(full_target): PRIVATE_CLASSPATH := $(subst $(space),:,$(full_java_libs)) -- cgit v1.2.3