commit 5e2526706be97ceee436e6f0b7e6c1c35619b851
author David 'Digit' Turner <digit@google.com> Mon May 05 18:47:29 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 05 18:47:29 2014 +0000
tree e630b465c9b0685509b82c2a8ad6b606181e3d5c
parent 8edfe36a7219bcd8f01574fa88f1e3fbbdbc9a3e
parent 18c664d95e68c0f3676dc7697f45436407c81fa7

Merge "Disable 64-bit Darwin platform build." into idea133

Makefile.android

diff --git a/Makefile.android b/Makefile.android
index 739143a..b5a6008 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -255,6 +255,13 @@
 # yet due to differing procedure call ABI conventions.
 EMULATOR_BUILD_64BITS := $(strip $(filter linux darwin,$(HOST_OS)))
 
+# Disable 64-bit build for Darwin platform builds.
+ifeq ($(HOST_OS),darwin)
+ifneq (true,$(BUILD_STANDALONE_EMULATOR))
+EMULATOR_BUILD_64BITS := $(strip $(empty))
+endif # BUILD_STANDALONE_EMULATOR != true
+endif # HOST_OS == darwin
+
 include $(LOCAL_PATH)/Makefile.common
 
 ifeq ($(HOST_OS),windows)