commit 40728bccbcba5ff1bf5979bd8d3b4446fb162ead
author Dimitry Ivanov <dimitry@google.com> Wed Dec 09 19:35:02 2015 +0000
committer Dimitry Ivanov <dimitry@google.com> Wed Dec 09 19:35:02 2015 +0000
tree f09ce774b7eb4fabf10f41a998d91864249175d4
parent f74b041cce75091b922151d4fa57e63c8a6caf4b

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

This reverts commit f74b041cce75091b922151d4fa57e63c8a6caf4b.

Bug: 25654402
Change-Id: I77386ea3655868d7cd1a8130afbc95e70549389e

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index e9ec69d..8b678ff 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -125,11 +125,9 @@
 
 static const char* const kDefaultLdPaths[] = {
 #if defined(__LP64__)
-  "/odm/lib64",
   "/vendor/lib64",
   "/system/lib64",
 #else
-  "/odm/lib",
   "/vendor/lib",
   "/system/lib",
 #endif
@@ -138,15 +136,11 @@
 
 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",