From e947865041c3e8b32ea43e74d95c33e2153152ee Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Thu, 30 Sep 2010 14:41:54 -0700
Subject: [PATCH] Allow 'export WITH_HOST_DALVIK=false' to override Makefile
 defaulting

Change-Id: I8915bc1c9f52a3b6ab1a82b404ab61cd0726198d
---
 core/envsetup.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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
 
 
 # ---------------------------------------------------------------