am 6d2dd6a7: Merge "Fix 2nd arch prefix application"

* commit '6d2dd6a74035a7ace838dd44e7910d54e15c11c2':
  Fix 2nd arch prefix application
This commit is contained in:
Dmitriy Ivanov 2014-10-07 17:12:58 +00:00 committed by Android Git Automerger
commit 9ec3d2e69a

View File

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