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
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 1c1650e..a032068 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -129,26 +129,26 @@
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
};