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

* commit '40a744fac798485c9b7a0594b1df548b7803768b': Disallow dlopen("egl/blah.so") on LP64
2014-05-03 01:48:37 +00:00 · 2014-05-03 01:48:37 +00:00 · 1d347514c1
commit 1d347514c1
parent 39372de58c 40a744fac7
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.