commit 8b898d122cb9c933e6f84bd4ef55421e034aa065
author Dimitry Ivanov <dimitry@google.com> Wed Feb 03 22:04:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 03 22:04:35 2016 +0000
tree 87adcb6d4ad0e50dea992fe9bfa497ec720e2b61
parent 9913c4cbaf1bbd5c5561f81453b7c9855786f514
parent 10e4fd56b5e86ca1a9a6bbcb4b62f6f4592bf508

Merge "linker: Change the library search order" am: c92ffa95fc
am: 10e4fd56b5

* commit '10e4fd56b5e86ca1a9a6bbcb4b62f6f4592bf508':
  linker: Change the library search order

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index a9d8ec6..f7dbdf0 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
 };