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
This commit is contained in:
Dimitry Ivanov 2016-02-01 23:00:55 -08:00
parent 37591462fa
commit 88f5111123
1 changed files with 6 additions and 6 deletions

View File

@ -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
};