diff options
| author | Ying Wang <wangying@google.com> | 2014-07-08 01:38:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-08 01:38:44 +0000 |
| commit | 55ec7e63d016fd4d43f9d3e3be026850c5efbd13 (patch) | |
| tree | 3a3c98e63f6ad4a66b94a89d0eab7345888d9d81 /core/droiddoc.mk | |
| parent | f951b7743f3b5e0af933749de169b1165de14ef0 (diff) | |
| parent | 9e00b6385c5805743f5beaa22dffce021342ed5e (diff) | |
| download | build-55ec7e63d016fd4d43f9d3e3be026850c5efbd13.tar.gz build-55ec7e63d016fd4d43f9d3e3be026850c5efbd13.tar.bz2 build-55ec7e63d016fd4d43f9d3e3be026850c5efbd13.zip | |
am 9e00b638: am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '9e00b6385c5805743f5beaa22dffce021342ed5e':
Fix host java doc by referring to the correct classpath.
Diffstat (limited to 'core/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index ea5c2f221..655af9bcf 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)) |