commit 91b0c68009c6d6efbaab8f268a5c9afb141c5ab4
author dimitry <dimitry@google.com> Fri Mar 29 05:34:33 2019 +0100
committer dimitry <dimitry@google.com> Fri Mar 29 05:34:33 2019 +0100
tree 2fe44df10a59edd89546b62918360aebee08e056
parent d7270b25876903aa10ad4db18d6171981db7f1d0

Fix CtsJniTestCases

The linker_namespaces test need android_get_LD_LIBRARY_PATH function.

Bug: http://b/129479780
Test: atest CtsJniTestCases
Change-Id: Iba5f74e1e4b5b1de173150120293102524db2507

libdl/libdl.cpp

diff --git a/libdl/libdl.cpp b/libdl/libdl.cpp
index f3a76d4..1ee4012 100644
--- a/libdl/libdl.cpp
+++ b/libdl/libdl.cpp
@@ -25,6 +25,9 @@
 extern "C" {
 
 __attribute__((__weak__, visibility("default")))
+void __loader_android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size);
+
+__attribute__((__weak__, visibility("default")))
 void* __loader_dlopen(const char* filename, int flags, const void* caller_addr);
 
 __attribute__((__weak__, visibility("default")))
@@ -71,6 +74,11 @@
 
 // Proxy calls to bionic loader
 __attribute__((__weak__))
+void android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size) {
+  __loader_android_get_LD_LIBRARY_PATH(buffer, buffer_size);
+}
+
+__attribute__((__weak__))
 void* dlopen(const char* filename, int flag) {
   const void* caller_addr = __builtin_return_address(0);
   return __loader_dlopen(filename, flag, caller_addr);

libdl/libdl.map.txt

diff --git a/libdl/libdl.map.txt b/libdl/libdl.map.txt
index b4b4117..473bdf2 100644
--- a/libdl/libdl.map.txt
+++ b/libdl/libdl.map.txt
@@ -43,5 +43,6 @@
 
 LIBC_PLATFORM {
   global:
+    android_get_LD_LIBRARY_PATH;
     __cfi_init;
 } LIBC_OMR1;