diff options
| author | Ying Wang <wangying@google.com> | 2014-07-07 16:43:49 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-07 16:50:39 -0700 |
| commit | ad7809bba403f3cf4f8bc5d859a2f9b959159f82 (patch) | |
| tree | b0ac650e7a25e8113bad5d5ab0292238458584f9 /core | |
| parent | 7b53bca0b925bc9f47b51afba14c3c8f064eae81 (diff) | |
| download | build-ad7809bba403f3cf4f8bc5d859a2f9b959159f82.zip build-ad7809bba403f3cf4f8bc5d859a2f9b959159f82.tar.gz build-ad7809bba403f3cf4f8bc5d859a2f9b959159f82.tar.bz2 | |
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
Diffstat (limited to 'core')
| -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 90ef0b3..ecfe3dc 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)) |