summaryrefslogtreecommitdiffstats
path: root/core/host_java_library.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-12-03 15:49:13 -0800
committerYing Wang <wangying@google.com>2012-12-03 15:49:13 -0800
commit96aa714534c394f0f9db1f0cf2c4c86a0f04b654 (patch)
treeee34075c4c052f1e375f065e73bc860cffad698e /core/host_java_library.mk
parentf8728e66222a00146ba87e800ccdb776cb9e5156 (diff)
downloadbuild-96aa714534c394f0f9db1f0cf2c4c86a0f04b654.zip
build-96aa714534c394f0f9db1f0cf2c4c86a0f04b654.tar.gz
build-96aa714534c394f0f9db1f0cf2c4c86a0f04b654.tar.bz2
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
Diffstat (limited to 'core/host_java_library.mk')
-rw-r--r--core/host_java_library.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index c938d57..91942dc 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -24,6 +24,10 @@ LOCAL_IS_HOST_MODULE := true
LOCAL_BUILT_MODULE_STEM := javalib.jar
ifeq ($(LOCAL_BUILD_HOST_DEX),true)
+ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
+ LOCAL_JAVA_LIBRARIES := $(sort core-hostdex $(LOCAL_JAVA_LIBRARIES))
+endif
+
intermediates := $(call local-intermediates-dir)
intermediates.COMMON := $(call local-intermediates-dir,COMMON)