From d206afecb87d43bf216edd41bec308a6861e0711 Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Thu, 30 Jan 2014 08:47:53 -0800
Subject: Disable WITH_HOST_DALVIK on 64bit host builds.

Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
---
 core/product_config.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core')

diff --git a/core/product_config.mk b/core/product_config.mk
index 7a27426d7..11336d8f0 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.
-- 
cgit v1.2.3