commit f74b041cce75091b922151d4fa57e63c8a6caf4b
author Hung-ying Tyan <tyanh@google.com> Thu Nov 12 11:48:19 2015 +0800
committer Hung-ying Tyan <tyanh@google.com> Wed Nov 18 23:45:25 2015 +0800
tree 41df671688b0a28e252f58659b14d6a23bb79913
parent 63f0e0db768ea9be4db3dd6a2fb62ea942afb9d6

Add /odm/lib to shared lib search path

ODM's shared libs should live in /odm/lib on the ODM partition.

BUG: 25654402
Change-Id: I3f5c26f208af87ff2817e490e51d0b4f5b8ec98e

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 8b678ff..e9ec69d 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",