generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix arm64 and arm builds.

Browse Source 
Bug: 18186310

(cherry picked from commit 4e446b19d8)

Change-Id: Ibc77a9ade36dc6b9bf5a316b5ab9ae5f0a70e826
This commit is contained in:
Dmitriy Ivanov
2014-10-31 17:27:02 -07:00
parent 976402cca1
commit 445111a1c9
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/Android.mk
View File

@@ -248,8 +248,11 @@ bionic-unit-tests_shared_libraries_target := \
libdl \ libdl \
libpagemap \ libpagemap \
libdl_preempt_test_1 \ libdl_preempt_test_1 \
libdl_preempt_test_2 \ libdl_preempt_test_2
libdl_test_df_1_global
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 := bionic-unit-tests
module_tag := optional module_tag := optional
@@ -293,8 +296,11 @@ bionic-unit-tests-glibc_src_files := \
bionic-unit-tests-glibc_shared_libraries := \ bionic-unit-tests-glibc_shared_libraries := \
libdl_preempt_test_1 \ libdl_preempt_test_1 \
libdl_preempt_test_2 \ libdl_preempt_test_2
libdl_test_df_1_global
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 := \ bionic-unit-tests-glibc_whole_static_libraries := \
libBionicStandardTests \ libBionicStandardTests \

4
tests/dlfcn_test.cpp
View File

@@ -500,7 +500,7 @@ TEST(dlfcn, dlopen_nodelete_dt_flags_1) {
} }
TEST(dlfcn, dlsym_df_1_global) { 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); void* handle = dlopen("libtest_dlsym_df_1_global.so", RTLD_NOW);
ASSERT_TRUE(handle != nullptr) << dlerror(); ASSERT_TRUE(handle != nullptr) << dlerror();
int (*get_answer)(); int (*get_answer)();
@@ -509,7 +509,7 @@ TEST(dlfcn, dlsym_df_1_global) {
ASSERT_EQ(42, get_answer()); ASSERT_EQ(42, get_answer());
ASSERT_EQ(0, dlclose(handle)); ASSERT_EQ(0, dlclose(handle));
#else #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 #endif
} }

2
tests/libs/Android.mk
View File

@@ -311,7 +311,7 @@ include $(LOCAL_PATH)/Android.build.testlib.mk
# Library with DF_1_GLOBAL # Library with DF_1_GLOBAL
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# TODO: re-enable arm once b/18137520 or b/18130452 are fixed # 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_src_files := dl_df_1_global.cpp
libdl_test_df_1_global_ldflags := -fuse-ld=bfd -Wl,-z,global libdl_test_df_1_global_ldflags := -fuse-ld=bfd -Wl,-z,global
module := libdl_test_df_1_global module := libdl_test_df_1_global