commit c92ffa95fc2f9ef4d381033d313797cffe14709e
author Dimitry Ivanov <dimitry@google.com> Wed Feb 03 21:58:40 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 03 21:58:40 2016 +0000
tree f0432db9031ad69d520b72c621b75f88ebde4ea0
parent 36ff6995707112e66dd0dec78be7f8ee9b95d321
parent 88f5111123d9900fc4da05435aa8416a6f9f9bcd

Merge "linker: Change the library search order"

linker/linker.cpp

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