commit 2269d2a647dbd4ad60a32be0238eda4db844d95b
author Colin Cross <ccross@android.com> Thu Mar 20 12:55:13 2014 -0700
committer Colin Cross <ccross@android.com> Thu Mar 20 12:55:13 2014 -0700
tree 30931ac7b96100f56a7fb7b9324a3c0549b797af
parent 378144e8afc96aa9f15e3a0d9ad28bf8364fa4aa

HACK: force target art executables to be compiled for 32-bit

64-bit dex2oat doesn't support 32-bit targets yet, force all
art executables to compile 32-bit for now.

Change-Id: If69f0a45e55104a5e915a9c58afa9009aa68b71c

build/Android.executable.mk

diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index e8d48e4..ba54e04 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -97,6 +97,8 @@
 
   ifeq ($$(art_target_or_host),target)
     LOCAL_MODULE_TARGET_ARCH := $(ART_SUPPORTED_ARCH)
+    #HACK: force 32-bit until 64-bit dex2oat can handle 32-bit
+    LOCAL_32_BIT_ONLY := true
   endif
 
   ifeq ($$(art_target_or_host),target)