summaryrefslogtreecommitdiffstats
path: root/core/product_config.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-05-15 01:09:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-15 01:09:49 +0000
commit8200231ae1891fdb3bba8ff4cefbaea88dbbe61b (patch)
treec5723c19132194cdd6ba7075618b18988129f93b /core/product_config.mk
parent5772ce61307af9a02b0886357aa7acc1b6a3c76d (diff)
parente50f2d9f32a27d8290692dbf99ab8b247ef9d553 (diff)
downloadbuild-8200231ae1891fdb3bba8ff4cefbaea88dbbe61b.zip
build-8200231ae1891fdb3bba8ff4cefbaea88dbbe61b.tar.gz
build-8200231ae1891fdb3bba8ff4cefbaea88dbbe61b.tar.bz2
am e50f2d9f: am 40b49d30: am a74ade94: Merge "Support host multilib build"
* commit 'e50f2d9f32a27d8290692dbf99ab8b247ef9d553': Support host multilib build
Diffstat (limited to 'core/product_config.mk')
-rw-r--r--core/product_config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/product_config.mk b/core/product_config.mk
index 171c394..7f86d81 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -164,7 +164,7 @@ endif # unbundled_goals
# Default to building dalvikvm on hosts that support it...
ifeq ($(HOST_OS),linux)
-ifeq ($(BUILD_HOST_64bit),)
+ifneq ($(HOST_ARCH),x86_64)
# ... or if the if the option is already set
ifeq ($(WITH_HOST_DALVIK),)
WITH_HOST_DALVIK := true