commit 96aa714534c394f0f9db1f0cf2c4c86a0f04b654
author Ying Wang <wangying@google.com> Mon Dec 03 15:49:13 2012 -0800
committer Ying Wang <wangying@google.com> Mon Dec 03 15:49:13 2012 -0800
tree ee34075c4c052f1e375f065e73bc860cffad698e
parent f8728e66222a00146ba87e800ccdb776cb9e5156

Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true

Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd

core/host_java_library.mk

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_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)