summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-01-30 08:47:53 -0800
committerIan Rogers <irogers@google.com>2014-01-30 08:55:17 -0800
commitd206afecb87d43bf216edd41bec308a6861e0711 (patch)
tree25a76ea7d62ab893d585ac55b3da4f6b95053d6d /core
parentad9209adff8d2f94c57387ee3d3abcff28049091 (diff)
downloadbuild-d206afecb87d43bf216edd41bec308a6861e0711.zip
build-d206afecb87d43bf216edd41bec308a6861e0711.tar.gz
build-d206afecb87d43bf216edd41bec308a6861e0711.tar.bz2
Disable WITH_HOST_DALVIK on 64bit host builds.
Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
Diffstat (limited to 'core')
-rw-r--r--core/product_config.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/product_config.mk b/core/product_config.mk
index 7a27426..11336d8 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -164,11 +164,13 @@ endif # unbundled_goals
# Default to building dalvikvm on hosts that support it...
ifeq ($(HOST_OS),linux)
+ifeq ($(BUILD_HOST_64bit),)
# ... or if the if the option is already set
ifeq ($(WITH_HOST_DALVIK),)
WITH_HOST_DALVIK := true
endif
endif
+endif
# ---------------------------------------------------------------
# Include the product definitions.