Merge "Remove usage of LOCAL_BUILD_HOST_DEX"
diff --git a/test/Android.mk b/test/Android.mk
index da469d7..881d664 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -84,10 +84,9 @@
LOCAL_JAVA_LIBRARIES := $(HOST_CORE_JARS)
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_DEX_PREOPT_IMAGE := $(HOST_CORE_IMG_OUT)
- LOCAL_BUILD_HOST_DEX := true
LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
- include $(BUILD_HOST_JAVA_LIBRARY)
+ include $(BUILD_DALVIK_HOST_JAVA_LIBRARY)
ART_TEST_HOST_DEX_FILES += $$(LOCAL_MODULE_PATH)/$$(LOCAL_MODULE).jar
endif
endef