commit 1a586293400d0e1d73e6eb82f7dfe9d2d9ed3c4b
author Elliott Hughes <enh@google.com> Tue Jun 03 16:23:08 2014 -0700
committer Elliott Hughes <enh@google.com> Tue Jun 03 16:23:08 2014 -0700
tree ed43eab1330d4f637c5fc543eb7cbe566c9a044a
parent be15d16b7246e32a1e622d4442cf919646bc71a9

Remove an unused parameter from the dlopen implementation.

Change-Id: I9297913a743bb570b48ebbe594ff711a481e89e0

linker/dlfcn.cpp

diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 7bcb59f..6d63ad6 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -65,10 +65,9 @@
   do_android_update_LD_LIBRARY_PATH(ld_library_path);
 }
 
-static void* dlopen_ext(const char* filename, int flags, const android_dlextinfo* extinfo, const void* caller_addr) {
+static void* dlopen_ext(const char* filename, int flags, const android_dlextinfo* extinfo) {
   ScopedPthreadMutexLocker locker(&g_dl_mutex);
-  soinfo* caller_soinfo = find_containing_library(caller_addr);
-  soinfo* result = do_dlopen(filename, flags, caller_soinfo, extinfo);
+  soinfo* result = do_dlopen(filename, flags, extinfo);
   if (result == NULL) {
     __bionic_format_dlerror("dlopen failed", linker_get_error_buffer());
     return NULL;
@@ -77,13 +76,11 @@
 }
 
 void* android_dlopen_ext(const char* filename, int flags, const android_dlextinfo* extinfo) {
-  void* caller_addr = __builtin_return_address(0);
-  return dlopen_ext(filename, flags, extinfo, caller_addr);
+  return dlopen_ext(filename, flags, extinfo);
 }
 
 void* dlopen(const char* filename, int flags) {
-  void* caller_addr = __builtin_return_address(0);
-  return dlopen_ext(filename, flags, NULL, caller_addr);
+  return dlopen_ext(filename, flags, NULL);
 }
 
 void* dlsym(void* handle, const char* symbol) {
@@ -258,4 +255,3 @@
 
   return &__libdl_info;
 }
-