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

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

Fix use of LOCAL_CLASSPATH in droiddoc.mk 

Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.

Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
(cherry picked from commit 8578cab0)
parent cef39240

core/droiddoc.mk

+3 −11
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ ifeq ($(LOCAL_DROIDDOC_CUSTOM_ASSET_DIR),) 
LOCAL_DROIDDOC_CUSTOM_ASSET_DIR := assets

endif



$(full_target): PRIVATE_CLASSPATH:=$(LOCAL_CLASSPATH)

full_java_lib_deps :=



$(full_target): PRIVATE_BOOTCLASSPATH :=

ifeq ($(BUILD_OS),linux)
@@ -75,19 +73,13 @@ else 
endif  # LOCAL_SDK_VERSION

LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))



full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

endif # !LOCAL_IS_HOST_MODULE



# we're not going to generate docs from any of these classes, but we need them

# to build properly.

ifneq ($(strip $(LOCAL_STATIC_JAVA_LIBRARIES)),)

full_java_libs += $(addprefix $(LOCAL_PATH)/,$(LOCAL_STATIC_JAVA_LIBRARIES)) $(LOCAL_CLASSPATH)

full_java_lib_deps += $(addprefix $(LOCAL_PATH)/,$(LOCAL_STATIC_JAVA_LIBRARIES)) $(LOCAL_CLASSPATH)

endif

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



endif # !LOCAL_IS_HOST_MODULE



intermediates.COMMON := $(call local-intermediates-dir,COMMON)