commit 4e446b19d8710cd2004785db4a00f18f249fe73f
author Dmitriy Ivanov <dimitry@google.com> Fri Oct 31 17:27:02 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri Oct 31 17:27:02 2014 -0700
tree 1c7618642ff6c6ec18ed49fbe1e64546e522f3b3
parent f33ad400230fa1f16ba4501efb60a1b6035e06ca

Fix arm64 and arm builds.

Change-Id: I2c8c41626768e792f27a2616f2cd5ae66606319d

tests/libs/Android.mk

diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index a454420..2fb0b12 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -312,7 +312,7 @@
 # Library with DF_1_GLOBAL
 # -----------------------------------------------------------------------------
 # TODO: re-enable arm once b/18137520 or b/18130452 are fixed
-ifeq ($(filter $(TARGET_ARCH),arm),)
+ifeq ($(filter $(TARGET_ARCH),arm arm64),)
 libdl_test_df_1_global_src_files := dl_df_1_global.cpp
 libdl_test_df_1_global_ldflags := -fuse-ld=bfd -Wl,-z,global
 module := libdl_test_df_1_global