From: Dmitriy Ivanov <dimitry@google.com>
Date: Sat, 1 Nov 2014 00:27:02 +0000 (-0700)
Subject: Fix arm64 and arm builds.
X-Git-Tag: android-x86-6.0-r1~14^2^2~25
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=445111a1c977e94a4233efd54f3690defa4a7582;p=android-x86%2Fbionic.git

Fix arm64 and arm builds.

Bug: 18186310

(cherry picked from commit 4e446b19d8710cd2004785db4a00f18f249fe73f)

Change-Id: Ibc77a9ade36dc6b9bf5a316b5ab9ae5f0a70e826
---

diff --git a/tests/Android.mk b/tests/Android.mk
index 6423df183..5a1127b96 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -248,8 +248,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
@@ -293,8 +296,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 a7fe2f852..2f0d430f6 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 f45e5a80f..7d959d484 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),)
+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