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/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 3647cd0..fec4cf6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -256,8 +256,11 @@
     libdl \
     libpagemap \
     libdl_preempt_test_1 \
-    libdl_preempt_test_2 \
-    libdl_test_df_1_global
+    libdl_preempt_test_2
+
+ifneq ($(filter $(TARGET_ARCH),arm arm64),$(TARGET_ARCH))
+bionic-unit-tests_shared_libraries_target += libdl_test_df_1_global
+endif
 
 module := bionic-unit-tests
 module_tag := optional
@@ -309,8 +312,11 @@
 
 bionic-unit-tests-glibc_shared_libraries := \
     libdl_preempt_test_1 \
-    libdl_preempt_test_2 \
-    libdl_test_df_1_global
+    libdl_preempt_test_2
+
+ifneq ($(filter $(TARGET_ARCH),arm arm64),$(TARGET_ARCH))
+bionic-unit-tests-glibc_shared_libraries += libdl_test_df_1_global
+endif
 
 bionic-unit-tests-glibc_whole_static_libraries := \
     libBionicStandardTests \