commit 0422296278dd325256642507b87463e6511a0f65
author Brian Carlstrom <bdc@google.com> Mon Nov 25 16:00:47 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 25 16:00:47 2013 -0800
tree ea7e797015ae4e57089514f6f1b53d2d1fbf15f7
parent a7509eeef5d687000688bddedaae91a261c58c13
parent 2e5b38d83234ff5a9a068ab07e7c51187ecd81a3

am 2e5b38d8: Merge "Fix BUILD_DALVIK_HOST_JAVA_LIBRARY to BUILD_HOST_DALVIK_JAVA_LIBRARY"

* commit '2e5b38d83234ff5a9a068ab07e7c51187ecd81a3':
  Fix BUILD_DALVIK_HOST_JAVA_LIBRARY to BUILD_HOST_DALVIK_JAVA_LIBRARY

test/Android.mk

diff --git a/test/Android.mk b/test/Android.mk
index 881d664..e4885f3 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -86,7 +86,7 @@
     LOCAL_DEX_PREOPT_IMAGE := $(HOST_CORE_IMG_OUT)
     LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
     LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
-    include $(BUILD_DALVIK_HOST_JAVA_LIBRARY)
+    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
     ART_TEST_HOST_DEX_FILES += $$(LOCAL_MODULE_PATH)/$$(LOCAL_MODULE).jar
   endif
 endef