commit 75d66dd9a7d6add031f4c2206751c45c937fc139
author Dmitriy Ivanov <dimitry@google.com> Tue Oct 07 09:46:46 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Tue Oct 07 09:46:46 2014 -0700
tree 0b5f970a4e21cf90153fd9bb52307f9f310f9028
parent 81fca35672df90e2f770e67bbf7e7735c6ff8bd8

Fix 2nd arch prefix application

Bug: 17887283
Change-Id: I7b3b2332212fe416d6b5f5c2e5c1e07605ba09aa

tests/libs/Android.mk

diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index 0cff660..ad2db0d 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -98,10 +98,10 @@
 # Library used by dlext tests - zipped and aligned
 # -----------------------------------------------------------------------------
 include $(CLEAR_VARS)
-bionic_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
+bionic_2nd_arch_prefix :=
 include $(LOCAL_PATH)/Android.build.dlext_testzip.mk
 ifneq ($(TARGET_2ND_ARCH),)
-  bionic_2nd_arch_prefix :=
+  bionic_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
   include $(LOCAL_PATH)/Android.build.dlext_testzip.mk
 endif