summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2015-12-10 03:15:57 -0800
committer android-build-merger <android-build-merger@google.com> 2015-12-10 03:15:57 -0800
commitfc41516ef5198b14aeb0fe9a85f7b4e7c842b5ef (patch)
tree1bf7c55618b74ec4c497c86558112f13c5970625
parente31102e26d16514e82e6d725c6886fa9701b4694 (diff)
parenta10a0750cf8a916080067997eedfb80c03d74b51 (diff)
Merge "Fix the build-art-multi-executable Make function."
am: a10a0750cf * commit 'a10a0750cf8a916080067997eedfb80c03d74b51': Fix the build-art-multi-executable Make function.
-rw-r--r--build/Android.executable.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index f543a1936b..cb6d340588 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -228,8 +228,8 @@ define build-art-multi-executable
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