commit 0ebe2f07c35d4b764bc5d8b5226004e3db46da91
author Hung-ying Tyan <tyanh@google.com> Thu Nov 19 16:38:51 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 19 16:38:51 2015 +0000
tree 91ca8bc80522a8a6b4dc4c6cce90f21eeba15292
parent 313632db574d101275206ca025d21a5a3cd62150
parent f74b041cce75091b922151d4fa57e63c8a6caf4b

Merge "Add /odm/lib to shared lib search path"

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 9cc4aba..1ecf65b 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -125,9 +125,11 @@
 
 static const char* const kDefaultLdPaths[] = {
 #if defined(__LP64__)
+  "/odm/lib64",
   "/vendor/lib64",
   "/system/lib64",
 #else
+  "/odm/lib",
   "/vendor/lib",
   "/system/lib",
 #endif
@@ -136,11 +138,15 @@
 
 static const char* const kAsanDefaultLdPaths[] = {
 #if defined(__LP64__)
+  "/data/odm/lib64",
+  "/odm/lib64",
   "/data/vendor/lib64",
   "/vendor/lib64",
   "/data/lib64",
   "/system/lib64",
 #else
+  "/data/odm/lib",
+  "/odm/lib",
   "/data/vendor/lib",
   "/vendor/lib",
   "/data/lib",