commit afdc560ad421d0b699ec5d6723a9155e46d629ae
author Brian Carlstrom <bdc@google.com> Tue Jun 10 15:42:52 2014 -0700
committer Brian Carlstrom <bdc@google.com> Tue Jun 10 15:59:50 2014 -0700
tree c1e853993d242833acbc990a2b0d0f5ddb3b8547
parent 69d57a89595c7c0fba7b7f7b7c6b431a92137215

Fix for test-art-host

Courtesy of dallison@

Change-Id: I160a5c84c176f22168bf236899349b6087494807

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index aa167b2..a14b951 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -37,7 +37,11 @@
 ART_BUILD_HOST_NDEBUG ?= $(WITH_HOST_DALVIK)
 ART_BUILD_HOST_DEBUG ?= $(WITH_HOST_DALVIK)
 
+ifeq ($(HOST_PREFER_32_BIT),true)
+ART_HOST_ARCH := $(HOST_2ND_ARCH)
+else
 ART_HOST_ARCH := $(HOST_ARCH)
+endif
 
 ifeq ($(ART_BUILD_TARGET_NDEBUG),false)
 $(info Disabling ART_BUILD_TARGET_NDEBUG)