commit 8d3fde909e6c8df1757da5cb0cc722f6da61fe73
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 09 05:05:30 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 09 05:05:30 2018 +0000
tree 36fd81427d35f0704fefaf72c8ca795c29b66903
parent 139f458cedacdfbc7c9c851ee20ce1aebb30bff3
parent 7160b06db92cb34115191eb7e5f54fd8482084af

Merge "base_rules.mk: Don't use is_native for MULTILIB modules."

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 9234abe..cebf52b 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -499,18 +499,22 @@
 # separate the multiple architectures into subdirectories of the testcase folder.
 arch_dir :=
 is_native :=
+multi_arch :=
 ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
   is_native := true
+  multi_arch := true
 endif
 ifeq ($(LOCAL_MODULE_CLASS),NATIVE_BENCHMARK)
   is_native := true
+  multi_arch := true
 endif
 ifdef LOCAL_MULTILIB
-  is_native := true
+  multi_arch := true
 endif
-ifdef is_native
+ifdef multi_arch
   arch_dir := /$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)
 endif
+multi_arch :=
 
 # The module itself.
 $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \