diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-02-01 23:00:55 -0800 |
|---|---|---|
| committer | Dimitry Ivanov <dimitry@google.com> | 2016-02-01 23:00:55 -0800 |
| commit | 88f5111123d9900fc4da05435aa8416a6f9f9bcd (patch) | |
| tree | bc28393b90549bd66b15599584437a5646cde137 /linker/linker.cpp | |
| parent | 37591462fa76791c2372d789c3532c7cd0ca7a84 (diff) | |
linker: Change the library search order
Look into "/system/lib" before "/vendor/lib", this way
we can ensure that in case of name conflict /system libraries
take precedence.
Change-Id: Ifacdc9dc7a4e175853f499ed09782b2257f09e5a
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 1c1650e34..a032068a6 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -129,26 +129,26 @@ static soinfo* somain; // main process, always the one after libdl_info static const char* const kDefaultLdPaths[] = { #if defined(__LP64__) - "/vendor/lib64", "/system/lib64", + "/vendor/lib64", #else - "/vendor/lib", "/system/lib", + "/vendor/lib", #endif nullptr }; static const char* const kAsanDefaultLdPaths[] = { #if defined(__LP64__) - "/data/vendor/lib64", - "/vendor/lib64", "/data/lib64", "/system/lib64", + "/data/vendor/lib64", + "/vendor/lib64", #else - "/data/vendor/lib", - "/vendor/lib", "/data/lib", "/system/lib", + "/data/vendor/lib", + "/vendor/lib", #endif nullptr }; |