diff --git a/core/envsetup.mk b/core/envsetup.mk
index f556efe17..72c79619d 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -119,12 +119,16 @@ else
   HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH)
 endif
 
-# Build dalvikvm on hosts that support it, but not if we're building the sim
+# Default to building dalvikvm on hosts that support it...
 ifeq ($(HOST_OS),linux)
+# ... but not if we're building the sim...
 ifneq ($(TARGET_SIMULATOR),true)
+# ... or if the if the option is already set
+ifeq ($(WITH_HOST_DALVIK),)
 	WITH_HOST_DALVIK := true
 endif
 endif
+endif
 
 
 # ---------------------------------------------------------------