diff options
| author | Ying Wang <wangying@google.com> | 2014-07-08 00:39:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-02 20:59:15 +0000 |
| commit | 979d578ee40c0a7d3e25915049350a23165f7a5a (patch) | |
| tree | b3df8512d6f5cd7d3cd626476529238203fc364f | |
| parent | d2aa51b8aee454baf96d8ac6d1997dd9450ae974 (diff) | |
| parent | ad7809bba403f3cf4f8bc5d859a2f9b959159f82 (diff) | |
| download | build-979d578ee40c0a7d3e25915049350a23165f7a5a.zip build-979d578ee40c0a7d3e25915049350a23165f7a5a.tar.gz build-979d578ee40c0a7d3e25915049350a23165f7a5a.tar.bz2 | |
Merge "Fix host java doc by referring to the correct classpath."
| -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)) |