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

Commit ad7809bb authored by Ying Wang's avatar Ying Wang
Browse files

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
parent 7b53bca0

core/droiddoc.mk

+6 −3
Original line number Diff line number Diff line
@@ -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))