tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "linker: Change the library search order"

Browse source 
am: c92ffa95fc

* commit 'c92ffa95fc2f9ef4d381033d313797cffe14709e':
  linker: Change the library search order
This commit is contained in:
Dimitry Ivanov 2016-02-03 22:02:17 +00:00 committed by android-build-merger
commit 10e4fd56b5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
linker/linker.cpp
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
};