From f74b041cce75091b922151d4fa57e63c8a6caf4b Mon Sep 17 00:00:00 2001
From: Hung-ying Tyan <tyanh@google.com>
Date: Thu, 12 Nov 2015 11:48:19 +0800
Subject: [PATCH] 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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 8b678ffb5..e9ec69dfd 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -125,9 +125,11 @@ static soinfo* somain; // main process, always the one after libdl_info
 
 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 kDefaultLdPaths[] = {
 
 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",