am 80893060: am 2d822ebe: Merge "Disallow dlopen("egl/blah.so") on LP64"

* commit '80893060ddf59625e0b0906685cb2631763ecf74': Disallow dlopen("egl/blah.so") on LP64
2014-05-03 01:45:12 +00:00 · 2014-05-03 01:45:12 +00:00 · 40a744fac7
commit 40a744fac7
parent c4ced713b8 80893060dd
1 changed files with 3 additions and 0 deletions
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@ -680,6 +680,9 @@ static int open_library(const char* name) {
      return fd;
    }
    // ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now.
+#if defined(__LP64__)
+    return -1;
+#endif
  }

  // Otherwise we try LD_LIBRARY_PATH first, and fall back to the built-in well known paths.