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

* commit '2d822ebe7af5aea1f93b67753e56357ce601b5a9':
  Disallow dlopen("egl/blah.so") on LP64
This commit is contained in:
Dmitriy Ivanov 2014-05-03 01:42:06 +00:00 committed by Android Git Automerger
commit 80893060dd

View File

@ -680,6 +680,9 @@ static int open_library(const char* name) {
return fd; return fd;
} }
// ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now. // ...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. // Otherwise we try LD_LIBRARY_PATH first, and fall back to the built-in well known paths.