generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 0cf2657b: Merge "Fix library lookup for filenames with slash."

Browse Source 
* commit '0cf2657bc25242c097d42346d17eaae4107b1d55':
  Fix library lookup for filenames with slash.
This commit is contained in:
Dmitriy Ivanov 2015-03-18 22:22:59 +00:00 committed by Android Git Automerger
commit 10d70143ea
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linker/linker.cpp
View File

@ -942,12 +942,8 @@ static int open_library(const char* name, off64_t* file_offset) {
int fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CLOEXEC)); int fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CLOEXEC));
if (fd != -1) { if (fd != -1) {
*file_offset = 0; *file_offset = 0;
return fd;
} }
// ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now. return fd;
#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.