am 796a2df1: am 73ca57f5: Fix host-dexed libraries.
Merge commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6'
* commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6':
Fix host-dexed libraries.
diff --git a/core/base_rules.mk b/core/base_rules.mk
index e1575fa..04270f0 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -349,8 +349,13 @@
ifdef LOCAL_IS_HOST_MODULE
# TODO: make prebuilt java libraries use the same
# intermediates path pattern as target java libraries.
+ifeq ($(LOCAL_BUILD_HOST_DEX),true)
+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))
+else
full_java_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,$(addsuffix $(COMMON_JAVA_PACKAGE_SUFFIX),$(LOCAL_JAVA_LIBRARIES)))
full_java_lib_deps := $(full_java_libs)
+endif # LOCAL_BUILD_HOST_DEX
else
ifdef LOCAL_SDK_VERSION
ifneq ($(LOCAL_SDK_VERSION),current)