commit 5090964da02c956f099a49b5a3eb732c0085c58b
author Christopher Ferris <cferris@google.com> Mon Apr 28 21:10:37 2014 -0700
committer Christopher Ferris <cferris@google.com> Mon Apr 28 21:10:37 2014 -0700
tree 9442fa2596395c1b6f4827c15175e1243d463681
parent 0fd2e87a0cac56f772fe6fac4cd32de8a656a406

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

tests/Android.build.mk

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 @@
 
 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