diff options
author | 2015-12-10 11:11:43 +0000 | |
---|---|---|
committer | 2015-12-10 11:11:43 +0000 | |
commit | a10a0750cf8a916080067997eedfb80c03d74b51 (patch) | |
tree | 1bf7c55618b74ec4c497c86558112f13c5970625 | |
parent | 6d0aefdc1f536e093305e29770cf749acb3247e2 (diff) | |
parent | ea6f8d87d5396cf450c6dfb6f17159c7babcad87 (diff) |
Merge "Fix the build-art-multi-executable Make function."
-rw-r--r-- | build/Android.executable.mk | 4 |
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 |