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

Commit 9e00b638 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath." 

* commit 'cd02c025':
  Fix host java doc by referring to the correct classpath.
parents 1c00c702 cd02c025

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))