summaryrefslogtreecommitdiffstats
path: root/tests/Android.build.mk
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-04-28 21:10:37 -0700
committerChristopher Ferris <cferris@google.com>2014-04-28 21:10:37 -0700
commit5090964da02c956f099a49b5a3eb732c0085c58b (patch)
tree9442fa2596395c1b6f4827c15175e1243d463681 /tests/Android.build.mk
parent0fd2e87a0cac56f772fe6fac4cd32de8a656a406 (diff)
downloadbionic-5090964da02c956f099a49b5a3eb732c0085c58b.zip
bionic-5090964da02c956f099a49b5a3eb732c0085c58b.tar.gz
bionic-5090964da02c956f099a49b5a3eb732c0085c58b.tar.bz2
Fix potential makefile bug.
Since multilib is not set every time, it needs to be per module or there is a change that another target will use the multilib value set previously. Change-Id: I5c30e18d5111705cb3f6e3d4cd9ef8a28c9b746c
Diffstat (limited to 'tests/Android.build.mk')
-rw-r--r--tests/Android.build.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index 5a53685..c1a0f16 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -18,8 +18,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := $(module)
LOCAL_MODULE_TAGS := $(module_tag)
-LOCAL_MULTILIB := $(multilib)
-ifeq ($(multilib),both)
+LOCAL_MULTILIB := $($(module)_multilib)
+ifeq ($(LOCAL_MULTILIB),both)
LOCAL_MODULE_STEM_32 := $(module)32
LOCAL_MODULE_STEM_64 := $(module)64
endif