summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2010-09-22 11:55:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-22 11:55:29 -0700
commit77070aa757806d1617d707db4d2bd7931b2353fc (patch)
treeab5cbe75425228a0badb2796bf385a382215d8f4 /target
parent7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c (diff)
parentce7d5023c3df4c16ae395d64d51dd8345e40a39e (diff)
downloadbuild-77070aa757806d1617d707db4d2bd7931b2353fc.zip
build-77070aa757806d1617d707db4d2bd7931b2353fc.tar.gz
build-77070aa757806d1617d707db4d2bd7931b2353fc.tar.bz2
am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp * commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e': Turn dalvikvm host builds on by default when linux is the host OS.
Diffstat (limited to 'target')
-rw-r--r--target/product/core.mk8
1 files changed, 0 insertions, 8 deletions
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 @@ 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 += \