diff options
| author | Ying Wang <wangying@google.com> | 2013-06-25 12:34:11 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-06-25 21:05:11 +0000 |
| commit | f84bf8d0ca954e7a0768cb5c0d1024fa26a72756 (patch) | |
| tree | d53b4b6df08e06bae0faa1346aa2adc08fd47971 | |
| parent | cef39240fbdfb298a4ff4061bce835c001a4765d (diff) | |
| download | build-f84bf8d0ca954e7a0768cb5c0d1024fa26a72756.tar.gz | |
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 8578cab0667cf3a3da263d838e29b07060af9ba7)
| -rw-r--r-- | core/droiddoc.mk | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 83cf40456e..8a5c556adb 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -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) |