Merge "Only build hamcrest-hostdex if WITH_HOST_DALVIK is true."
diff --git a/Android.mk b/Android.mk
index 96798f4..fcd1a95 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,12 +26,14 @@
 
 # build for the host dalvik
 # -------------------------
+ifeq ($(WITH_HOST_DALVIK),true)
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_MODULE := hamcrest-hostdex
 LOCAL_MODULE_TAGS := optional
 LOCAL_BUILD_HOST_DEX := true
 include $(BUILD_HOST_JAVA_LIBRARY)
+endif