diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-07-21 11:33:40 -0700 |
|---|---|---|
| committer | Dimitry Ivanov <dimitry@google.com> | 2016-08-01 19:47:27 +0000 |
| commit | 769b33fadf45a039741f932672ac2c4f901d7d4a (patch) | |
| tree | bf29858de176dd3bf144c547174eb99e1727e85a /libdl | |
| parent | c5e79567e0b02eb3a02d6b2820b901d4ba392e87 (diff) | |
| download | bionic-769b33fadf45a039741f932672ac2c4f901d7d4a.tar.gz | |
Sync linker with internal branch
This change includes dlwarning implementation and
the compatibility greylist for apps targeting pre-N.
Change-Id: Ibf02a07cc58cbbb1a5aef4ac34558c5d43e4305f
Test: Run bionic-unit-tests --gtest_filter=dl*:Dl*
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 | 2 | ||||
| -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, 9 insertions, 0 deletions
diff --git a/libdl/libdl.arm.map b/libdl/libdl.arm.map index 20efa9a95..2cd49c5da 100644 --- a/libdl/libdl.arm.map +++ b/libdl/libdl.arm.map @@ -21,6 +21,7 @@ LIBC_N { LIBC_PLATFORM { global: + android_dlwarning; android_get_application_target_sdk_version; android_set_application_target_sdk_version; android_get_LD_LIBRARY_PATH; diff --git a/libdl/libdl.arm64.map b/libdl/libdl.arm64.map index daf5a86be..74e029c99 100644 --- a/libdl/libdl.arm64.map +++ b/libdl/libdl.arm64.map @@ -20,6 +20,7 @@ LIBC_N { LIBC_PLATFORM { global: + android_dlwarning; android_get_application_target_sdk_version; android_set_application_target_sdk_version; android_get_LD_LIBRARY_PATH; diff --git a/libdl/libdl.c b/libdl/libdl.c index fa5237f6f..b62ee5ccb 100644 --- a/libdl/libdl.c +++ b/libdl/libdl.c @@ -69,3 +69,5 @@ struct android_namespace_t* android_create_namespace(const char* name __unused, const char* permitted_when_isolated_path __unused) { return 0; } + +void android_dlwarning(void* obj, void (*f)(void*, const char*)) { f(obj, 0); } diff --git a/libdl/libdl.map.txt b/libdl/libdl.map.txt index 79bced3c2..962692ec9 100644 --- a/libdl/libdl.map.txt +++ b/libdl/libdl.map.txt @@ -35,6 +35,7 @@ LIBC_N { LIBC_PLATFORM { global: + android_dlwarning; android_get_application_target_sdk_version; android_set_application_target_sdk_version; android_get_LD_LIBRARY_PATH; diff --git a/libdl/libdl.mips.map b/libdl/libdl.mips.map index daf5a86be..74e029c99 100644 --- a/libdl/libdl.mips.map +++ b/libdl/libdl.mips.map @@ -20,6 +20,7 @@ LIBC_N { LIBC_PLATFORM { global: + android_dlwarning; android_get_application_target_sdk_version; android_set_application_target_sdk_version; android_get_LD_LIBRARY_PATH; diff --git a/libdl/libdl.mips64.map b/libdl/libdl.mips64.map index daf5a86be..74e029c99 100644 --- a/libdl/libdl.mips64.map +++ b/libdl/libdl.mips64.map @@ -20,6 +20,7 @@ LIBC_N { LIBC_PLATFORM { global: + android_dlwarning; android_get_application_target_sdk_version; android_set_application_target_sdk_version; android_get_LD_LIBRARY_PATH; diff --git a/libdl/libdl.x86.map b/libdl/libdl.x86.map index daf5a86be..74e029c99 100644 --- a/libdl/libdl.x86.map +++ b/libdl/libdl.x86.map @@ -20,6 +20,7 @@ LIBC_N { LIBC_PLATFORM { global: + android_dlwarning; android_get_application_target_sdk_version; android_set_application_target_sdk_version; android_get_LD_LIBRARY_PATH; diff --git a/libdl/libdl.x86_64.map b/libdl/libdl.x86_64.map index daf5a86be..74e029c99 100644 --- a/libdl/libdl.x86_64.map +++ b/libdl/libdl.x86_64.map @@ -20,6 +20,7 @@ LIBC_N { LIBC_PLATFORM { global: + android_dlwarning; android_get_application_target_sdk_version; android_set_application_target_sdk_version; android_get_LD_LIBRARY_PATH; |