From 494bee796aa60131981308493e0e295493537e12 Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Mon, 3 Nov 2014 21:13:55 -0800
Subject: [PATCH] Revert "Fix arm64 and arm builds."

This reverts commit 445111a1c977e94a4233efd54f3690defa4a7582.

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

diff --git a/tests/Android.mk b/tests/Android.mk
index 5a1127b96..6423df183 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -248,11 +248,8 @@ bionic-unit-tests_shared_libraries_target := \
     libdl \
     libpagemap \
     libdl_preempt_test_1 \
-    libdl_preempt_test_2
-
-ifneq ($(filter $(TARGET_ARCH),arm arm64),$(TARGET_ARCH))
-bionic-unit-tests_shared_libraries_target += libdl_test_df_1_global
-endif
+    libdl_preempt_test_2 \
+    libdl_test_df_1_global
 
 module := bionic-unit-tests
 module_tag := optional
@@ -296,11 +293,8 @@ bionic-unit-tests-glibc_src_files := \
 
 bionic-unit-tests-glibc_shared_libraries := \
     libdl_preempt_test_1 \
-    libdl_preempt_test_2
-
-ifneq ($(filter $(TARGET_ARCH),arm arm64),$(TARGET_ARCH))
-bionic-unit-tests-glibc_shared_libraries += libdl_test_df_1_global
-endif
+    libdl_preempt_test_2 \
+    libdl_test_df_1_global
 
 bionic-unit-tests-glibc_whole_static_libraries := \
     libBionicStandardTests \
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index 2f0d430f6..a7fe2f852 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__) && !defined(__aarch64__)
+#if !defined(__arm__)
   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/arm64 (to be reenabled once b/18137520 or b/18130452 are fixed).\n";
+  GTEST_LOG_(INFO) << "This test does nothing on arm (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 7d959d484..f45e5a80f 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -311,7 +311,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 arm64),)
+ifeq ($(filter $(TARGET_ARCH),arm),)
 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