commit 7ce10899dad0e4513dc095556bdcc9fa04949d27
author Roland Levillain <rpl@google.com> Thu Dec 10 11:18:18 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 11:18:18 2015 +0000
tree c5fbe712953f13bb598de6d0df627a6553acff61
parent 3a38a808920f6ee43da5b11b287cd9940395e909
parent fc41516ef5198b14aeb0fe9a85f7b4e7c842b5ef

Merge "Fix the build-art-multi-executable Make function." am: a10a0750cf
am: fc41516ef5

* commit 'fc41516ef5198b14aeb0fe9a85f7b4e7c842b5ef':
  Fix the build-art-multi-executable Make function.

build/Android.executable.mk

diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index f543a19..cb6d340 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -228,8 +228,8 @@
       art-multi-env-guard := $$(call art-string-to-uppercase,ART_BUILD_$(target_flavor)_$(debug_flavor))
 
       ifeq ($(target_flavor),host)
-        ifeq ($$($$(art-multi-host-prefer-32-bit)),true)
-          ifneq ($$($$(art-multi-multilib)),64)
+        ifeq ($$(art-multi-host-prefer-32-bit),true)
+          ifneq ($$(art-multi-multilib),64)
             art-multi-multilib := 32
           endif
         endif