am 46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread
Merge commit '46fc2341c535ba624fd2dceec9399ce681a80866' into gingerbread-plus-aosp
* commit '46fc2341c535ba624fd2dceec9399ce681a80866':
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 79e8b01..6b9271d 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -119,12 +119,16 @@
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
# ---------------------------------------------------------------