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

Merge "Add /odm/lib to shared lib search path"

Browse Source
This commit is contained in:
Hung-ying Tyan 2015-11-19 16:38:51 +00:00 committed by Gerrit Code Review
commit 0ebe2f07c3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linker/linker.cpp
View File

@ -125,9 +125,11 @@ static soinfo* somain; // main process, always the one after libdl_info
static const char* const kDefaultLdPaths[] = { static const char* const kDefaultLdPaths[] = {
#if defined(__LP64__) #if defined(__LP64__)
"/odm/lib64",
"/vendor/lib64", "/vendor/lib64",
"/system/lib64", "/system/lib64",
#else #else
"/odm/lib",
"/vendor/lib", "/vendor/lib",
"/system/lib", "/system/lib",
#endif #endif
@ -136,11 +138,15 @@ static const char* const kDefaultLdPaths[] = {
static const char* const kAsanDefaultLdPaths[] = { static const char* const kAsanDefaultLdPaths[] = {
#if defined(__LP64__) #if defined(__LP64__)
"/data/odm/lib64",
"/odm/lib64",
"/data/vendor/lib64", "/data/vendor/lib64",
"/vendor/lib64", "/vendor/lib64",
"/data/lib64", "/data/lib64",
"/system/lib64", "/system/lib64",
#else #else
"/data/odm/lib",
"/odm/lib",
"/data/vendor/lib", "/data/vendor/lib",
"/vendor/lib", "/vendor/lib",
"/data/lib", "/data/lib",