diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-05-02 01:37:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-02 01:37:04 +0000 |
commit | 87a47e1bb202a26918993487db8dc82229833ef8 (patch) | |
tree | 8f06d30e39972f84ac8d255ced62559dc98acf45 /libdl | |
parent | fd478a8cba97680974494bc72727fba6d8136805 (diff) | |
parent | 01de74e76d1131b5c5b0120d07e8f468ac5f8fac (diff) | |
download | bionic-87a47e1bb202a26918993487db8dc82229833ef8.tar.gz |
Merge "linker: add android_get_exported_namespace"
Diffstat (limited to 'libdl')
-rw-r--r-- | libdl/libdl.arm.map | 1 | ||||
-rw-r--r-- | libdl/libdl.arm64.map | 1 | ||||
-rw-r--r-- | libdl/libdl.c | 7 | ||||
-rw-r--r-- | libdl/libdl.map.txt | 1 | ||||
-rw-r--r-- | libdl/libdl.mips.map | 1 | ||||
-rw-r--r-- | libdl/libdl.mips64.map | 1 | ||||
-rw-r--r-- | libdl/libdl.x86.map | 1 | ||||
-rw-r--r-- | libdl/libdl.x86_64.map | 1 |
8 files changed, 14 insertions, 0 deletions
diff --git a/libdl/libdl.arm.map b/libdl/libdl.arm.map index c0dcd5d98..668f00888 100644 --- a/libdl/libdl.arm.map +++ b/libdl/libdl.arm.map @@ -47,4 +47,5 @@ LIBC_PLATFORM { android_init_anonymous_namespace; android_create_namespace; android_link_namespaces; + android_get_exported_namespace; } LIBC_N; diff --git a/libdl/libdl.arm64.map b/libdl/libdl.arm64.map index 3b797f79e..8270fe99d 100644 --- a/libdl/libdl.arm64.map +++ b/libdl/libdl.arm64.map @@ -46,4 +46,5 @@ LIBC_PLATFORM { android_init_anonymous_namespace; android_create_namespace; android_link_namespaces; + android_get_exported_namespace; } LIBC_N; diff --git a/libdl/libdl.c b/libdl/libdl.c index f7ca3f190..1a65b6776 100644 --- a/libdl/libdl.c +++ b/libdl/libdl.c @@ -94,6 +94,9 @@ bool __loader_android_link_namespaces( __attribute__((__weak__, visibility("default"))) void __loader_android_dlwarning(void* obj, void (*f)(void*, const char*)); +__attribute__((__weak__, visibility("default"))) +struct android_namespace_t* __loader_android_get_exported_namespace(const char* name); + // Proxy calls to bionic loader void* dlopen(const char* filename, int flag) { const void* caller_addr = __builtin_return_address(0); @@ -187,3 +190,7 @@ bool android_link_namespaces(struct android_namespace_t* namespace_from, void android_dlwarning(void* obj, void (*f)(void*, const char*)) { __loader_android_dlwarning(obj, f); } + +struct android_namespace_t* android_get_exported_namespace(const char* name) { + return __loader_android_get_exported_namespace(name); +} diff --git a/libdl/libdl.map.txt b/libdl/libdl.map.txt index 245e016ee..a4c6483c4 100644 --- a/libdl/libdl.map.txt +++ b/libdl/libdl.map.txt @@ -46,4 +46,5 @@ LIBC_PLATFORM { android_init_anonymous_namespace; android_create_namespace; android_link_namespaces; + android_get_exported_namespace; } LIBC_N; diff --git a/libdl/libdl.mips.map b/libdl/libdl.mips.map index 3b797f79e..8270fe99d 100644 --- a/libdl/libdl.mips.map +++ b/libdl/libdl.mips.map @@ -46,4 +46,5 @@ LIBC_PLATFORM { android_init_anonymous_namespace; android_create_namespace; android_link_namespaces; + android_get_exported_namespace; } LIBC_N; diff --git a/libdl/libdl.mips64.map b/libdl/libdl.mips64.map index 3b797f79e..8270fe99d 100644 --- a/libdl/libdl.mips64.map +++ b/libdl/libdl.mips64.map @@ -46,4 +46,5 @@ LIBC_PLATFORM { android_init_anonymous_namespace; android_create_namespace; android_link_namespaces; + android_get_exported_namespace; } LIBC_N; diff --git a/libdl/libdl.x86.map b/libdl/libdl.x86.map index 3b797f79e..8270fe99d 100644 --- a/libdl/libdl.x86.map +++ b/libdl/libdl.x86.map @@ -46,4 +46,5 @@ LIBC_PLATFORM { android_init_anonymous_namespace; android_create_namespace; android_link_namespaces; + android_get_exported_namespace; } LIBC_N; diff --git a/libdl/libdl.x86_64.map b/libdl/libdl.x86_64.map index 3b797f79e..8270fe99d 100644 --- a/libdl/libdl.x86_64.map +++ b/libdl/libdl.x86_64.map @@ -46,4 +46,5 @@ LIBC_PLATFORM { android_init_anonymous_namespace; android_create_namespace; android_link_namespaces; + android_get_exported_namespace; } LIBC_N; |