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
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 48a8743..5b0d88c 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -119,6 +119,11 @@
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 f3ec53f..440e0cc 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -225,11 +225,6 @@
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 c2dbca0..e68d04b 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -74,14 +74,6 @@
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 += \
