diff options
author | dimitry <dimitry@google.com> | 2018-01-29 15:32:37 +0100 |
---|---|---|
committer | dimitry <dimitry@google.com> | 2018-01-29 15:32:37 +0100 |
commit | 321476a3ecc6b25579b2ddfb86b10a405f90eb8c (patch) | |
tree | c0b4a8781d1fc16eecb53950a497d12d993b7ec0 /libdl | |
parent | fb56e048971e9955f902f2036299af726c02beab (diff) | |
download | bionic-321476a3ecc6b25579b2ddfb86b10a405f90eb8c.tar.gz |
Test ld-android.so directly
This CL addresses review comments from
https://android-review.googlesource.com/c/platform/bionic/+/595067
Test: bionic-unit-tests --gtest_filter=dl*
Change-Id: I2c0fdf2a89fe6ff134308e202fb99a74080ee0ed
Diffstat (limited to 'libdl')
-rw-r--r-- | libdl/libdl.arm.map | 5 | ||||
-rw-r--r-- | libdl/libdl.arm64.map | 5 | ||||
-rw-r--r-- | libdl/libdl.cpp | 11 | ||||
-rw-r--r-- | libdl/libdl.map.txt | 5 | ||||
-rw-r--r-- | libdl/libdl.mips.map | 5 | ||||
-rw-r--r-- | libdl/libdl.mips64.map | 5 | ||||
-rw-r--r-- | libdl/libdl.x86.map | 5 | ||||
-rw-r--r-- | libdl/libdl.x86_64.map | 5 |
8 files changed, 0 insertions, 46 deletions
diff --git a/libdl/libdl.arm.map b/libdl/libdl.arm.map index 7ed950361..1fcfc584d 100644 --- a/libdl/libdl.arm.map +++ b/libdl/libdl.arm.map @@ -41,11 +41,6 @@ LIBC_OMR1 { # introduced=27 __cfi_slowpath_diag; } LIBC_N; -LIBC_PRIVATE { - global: - android_link_namespaces_all_libs; -} LIBC_OMR1; - LIBC_PLATFORM { global: __cfi_init; diff --git a/libdl/libdl.arm64.map b/libdl/libdl.arm64.map index 199f2e344..8d4019ce4 100644 --- a/libdl/libdl.arm64.map +++ b/libdl/libdl.arm64.map @@ -40,11 +40,6 @@ LIBC_OMR1 { # introduced=27 __cfi_slowpath_diag; } LIBC_N; -LIBC_PRIVATE { - global: - android_link_namespaces_all_libs; -} LIBC_OMR1; - LIBC_PLATFORM { global: __cfi_init; diff --git a/libdl/libdl.cpp b/libdl/libdl.cpp index 4c2415f1f..c8340888e 100644 --- a/libdl/libdl.cpp +++ b/libdl/libdl.cpp @@ -93,11 +93,6 @@ bool __loader_android_link_namespaces( const char* shared_libs_sonames); __attribute__((__weak__, visibility("default"))) -bool __loader_android_link_namespaces_all_libs( - struct android_namespace_t* namespace_from, - struct android_namespace_t* namespace_to); - -__attribute__((__weak__, visibility("default"))) void __loader_android_dlwarning(void* obj, void (*f)(void*, const char*)); __attribute__((__weak__, visibility("default"))) @@ -210,12 +205,6 @@ bool android_link_namespaces(struct android_namespace_t* namespace_from, } __attribute__((__weak__)) -bool android_link_namespaces_all_libs(struct android_namespace_t* namespace_from, - struct android_namespace_t* namespace_to) { - return __loader_android_link_namespaces_all_libs(namespace_from, namespace_to); -} - -__attribute__((__weak__)) void android_dlwarning(void* obj, void (*f)(void*, const char*)) { __loader_android_dlwarning(obj, f); } diff --git a/libdl/libdl.map.txt b/libdl/libdl.map.txt index 579ffa709..002e9f828 100644 --- a/libdl/libdl.map.txt +++ b/libdl/libdl.map.txt @@ -40,11 +40,6 @@ LIBC_OMR1 { # introduced=27 __cfi_slowpath_diag; } LIBC_N; -LIBC_PRIVATE { - global: - android_link_namespaces_all_libs; -} LIBC_OMR1; - LIBC_PLATFORM { global: __cfi_init; diff --git a/libdl/libdl.mips.map b/libdl/libdl.mips.map index 199f2e344..8d4019ce4 100644 --- a/libdl/libdl.mips.map +++ b/libdl/libdl.mips.map @@ -40,11 +40,6 @@ LIBC_OMR1 { # introduced=27 __cfi_slowpath_diag; } LIBC_N; -LIBC_PRIVATE { - global: - android_link_namespaces_all_libs; -} LIBC_OMR1; - LIBC_PLATFORM { global: __cfi_init; diff --git a/libdl/libdl.mips64.map b/libdl/libdl.mips64.map index 199f2e344..8d4019ce4 100644 --- a/libdl/libdl.mips64.map +++ b/libdl/libdl.mips64.map @@ -40,11 +40,6 @@ LIBC_OMR1 { # introduced=27 __cfi_slowpath_diag; } LIBC_N; -LIBC_PRIVATE { - global: - android_link_namespaces_all_libs; -} LIBC_OMR1; - LIBC_PLATFORM { global: __cfi_init; diff --git a/libdl/libdl.x86.map b/libdl/libdl.x86.map index 199f2e344..8d4019ce4 100644 --- a/libdl/libdl.x86.map +++ b/libdl/libdl.x86.map @@ -40,11 +40,6 @@ LIBC_OMR1 { # introduced=27 __cfi_slowpath_diag; } LIBC_N; -LIBC_PRIVATE { - global: - android_link_namespaces_all_libs; -} LIBC_OMR1; - LIBC_PLATFORM { global: __cfi_init; diff --git a/libdl/libdl.x86_64.map b/libdl/libdl.x86_64.map index 199f2e344..8d4019ce4 100644 --- a/libdl/libdl.x86_64.map +++ b/libdl/libdl.x86_64.map @@ -40,11 +40,6 @@ LIBC_OMR1 { # introduced=27 __cfi_slowpath_diag; } LIBC_N; -LIBC_PRIVATE { - global: - android_link_namespaces_all_libs; -} LIBC_OMR1; - LIBC_PLATFORM { global: __cfi_init; |