From 4e446b19d8710cd2004785db4a00f18f249fe73f Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Fri, 31 Oct 2014 17:27:02 -0700
Subject: [PATCH] Fix arm64 and arm builds.

Change-Id: I2c8c41626768e792f27a2616f2cd5ae66606319d
---
 tests/Android.mk      | 14 ++++++++++----
 tests/dlfcn_test.cpp  |  4 ++--
 tests/libs/Android.mk |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/Android.mk b/tests/Android.mk
index 3647cd0f5..fec4cf672 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -256,8 +256,11 @@ bionic-unit-tests_shared_libraries_target := \
     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_src_files := \
 
 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 \
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index 060f7e09c..3af9e12a5 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -500,7 +500,7 @@ TEST(dlfcn, dlopen_nodelete_dt_flags_1) {
 }
 
 TEST(dlfcn, dlsym_df_1_global) {
-#if !defined(__arm__)
+#if !defined(__arm__) && !defined(__aarch64__)
   void* handle = dlopen("libtest_dlsym_df_1_global.so", RTLD_NOW);
   ASSERT_TRUE(handle != nullptr) << dlerror();
   int (*get_answer)();
@@ -509,7 +509,7 @@ TEST(dlfcn, dlsym_df_1_global) {
   ASSERT_EQ(42, get_answer());
   ASSERT_EQ(0, dlclose(handle));
 #else
-  GTEST_LOG_(INFO) << "This test does nothing on arm (to be reenabled once b/18137520 or b/18130452 are fixed).\n";
+  GTEST_LOG_(INFO) << "This test does nothing on arm/arm64 (to be reenabled once b/18137520 or b/18130452 are fixed).\n";
 #endif
 }
 
diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index a45442031..2fb0b1225 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -312,7 +312,7 @@ include $(LOCAL_PATH)/Android.build.testlib.mk
 # 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