Merge "linker: Change the library search order"

This commit is contained in:
Dimitry Ivanov 2016-02-03 21:58:40 +00:00 committed by Gerrit Code Review
commit c92ffa95fc
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
};