commit 754a4457ff34aa35336284e633be7ac0a23a683d
author Ying Wang <wangying@google.com> Tue Jul 21 12:05:30 2015 -0700
committer Ying Wang <wangying@google.com> Tue Jul 21 12:05:30 2015 -0700
tree 3ea3b3d55adde88d3f34212e60ce6fd3ed667831
parent af0365ac6a4c7d242df6f50c4da69ba0ff67e3f1

Prefer 32-bit host executables on Mac.

Bug: 22527295
Change-Id: I2cb1d3086b65b8227e6bdac9c0485fdc452f1e9c

build/Android.executable.mk

diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index a251c92..72cf978 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -127,6 +127,10 @@
     LOCAL_MODULE_TARGET_ARCH := $(ART_SUPPORTED_ARCH)
   endif
 
+  ifdef ART_MULTILIB_OVERRIDE_$$(art_target_or_host)
+    art_multilib := $$(ART_MULTILIB_OVERRIDE_$$(art_target_or_host))
+  endif
+
   LOCAL_MULTILIB := $$(art_multilib)
   art_out_binary_name := $$(LOCAL_MODULE)