commit e109930e9fd0922280e6f74b3df270093ee95fa6
author Elliott Hughes <enh@google.com> Thu Nov 01 23:08:27 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 01 23:08:27 2012 -0700
tree 2e2b3ea39d42bfe668635a526b31dc9fa1b8354b
parent 7f7ac8cd19f1a7fc61aa640505747dee9036fa61
parent dc77a22850e31eb369ec9776c13c967566bf61d0

am dc77a228: Merge "Allow dlopen("egl/blah.so")."

* commit 'dc77a22850e31eb369ec9776c13c967566bf61d0':
  Allow dlopen("egl/blah.so").

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 99cd92b..40f29a2 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -634,7 +634,11 @@
 
   // If the name contains a slash, we should attempt to open it directly and not search the paths.
   if (strchr(name, '/') != NULL) {
-    return TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CLOEXEC));
+    int fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CLOEXEC));
+    if (fd != -1) {
+      return fd;
+    }
+    // ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now.
   }
 
   // Otherwise we try LD_LIBRARY_PATH first, and fall back to the built-in well known paths.