commit d1ff49c24afb1bb09925cda295d2bb52d514f879
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 05 18:31:25 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 05 18:31:25 2019 +0000
tree 8308e8d1a9e073d1da68bae7bc56fdd4265beab7
parent 1701d887aca0374c000a018a974227064e77d769
parent ce584e4fc93978cb44057fce5f556e68519f051e

Merge changes Iba5f74e1,I92b88939

* changes:
  Fix CtsJniTestCases
  Fix formatting

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;

libdl/libdl_android.cpp

diff --git a/libdl/libdl_android.cpp b/libdl/libdl_android.cpp
index 9ad8250..77b3bf8 100644
--- a/libdl/libdl_android.cpp
+++ b/libdl/libdl_android.cpp
@@ -28,7 +28,7 @@
 void __loader_android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size);
 
 __attribute__((__weak__, visibility("default")))
-    void __loader_android_update_LD_LIBRARY_PATH(const char* ld_library_path);
+void __loader_android_update_LD_LIBRARY_PATH(const char* ld_library_path);
 
 __attribute__((__weak__, visibility("default")))
 void __loader_android_set_application_target_sdk_version(int target);