From ce7d5023c3df4c16ae395d64d51dd8345e40a39e Mon Sep 17 00:00:00 2001
From: Jesse Wilson <jessewilson@google.com>
Date: Wed, 22 Sep 2010 10:59:10 -0700
Subject: [PATCH] Turn dalvikvm host builds on by default when linux is the
 host OS.

Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.

Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
---
 core/envsetup.mk       | 5 +++++
 core/main.mk           | 5 -----
 target/product/core.mk | 8 --------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 48a87438e..5b0d88cb5 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -119,6 +119,11 @@ else
   HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH)
 endif
 
+# Build dalvikvm on hosts that support it
+ifeq ($(HOST_OS),linux)
+	WITH_HOST_DALVIK := true
+endif
+
 
 # ---------------------------------------------------------------
 # Set up configuration for target machine.
diff --git a/core/main.mk b/core/main.mk
index f3ec53f10..440e0ccf4 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -225,11 +225,6 @@ ifneq (,$(user_variant))
     WITH_DEXPREOPT := true
   endif
 
-  # TODO: Always set WITH_HOST_DALVIK (for user builds) once it works on OSX.
-  ifeq ($(HOST_OS),linux)
-    WITH_HOST_DALVIK := true
-  endif
-
   # Disallow mock locations by default for user builds
   ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0
 
diff --git a/target/product/core.mk b/target/product/core.mk
index c2dbca0e1..e68d04b00 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -74,14 +74,6 @@ PRODUCT_PACKAGES := \
     DefaultContainerService \
     Bugreport
 
-# force WITH_HOST_DALVIK on userdebug and user builds.
-# TODO: this is redundant with a similar clause in build/core/main.mk.
-ifneq (,$(filter userdebug user,$(TARGET_BUILD_VARIANT)))
-  ifeq ($(HOST_OS),linux)
-    WITH_HOST_DALVIK := true
-  endif
-endif
-
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)
     PRODUCT_PACKAGES += \