From 75d66dd9a7d6add031f4c2206751c45c937fc139 Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Tue, 7 Oct 2014 09:46:46 -0700
Subject: [PATCH] Fix 2nd arch prefix application

Bug: 17887283
Change-Id: I7b3b2332212fe416d6b5f5c2e5c1e07605ba09aa
---
 tests/libs/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index 0cff66051..ad2db0de9 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -98,10 +98,10 @@ include $(TEST_PATH)/Android.build.mk
 # 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