commit cb025e55f707216eb36b07f6fc36dcf604a45c07
author Dimitry Ivanov <dimitry@google.com> Thu Dec 10 20:17:02 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 10 20:17:02 2015 +0000
tree 75f49029f558b2f745119ded1e0a655cabe8f3b3
parent 9d8632e1a76de6bd6abc853c0fbd6a2c9dc32cdc
parent 40728bccbcba5ff1bf5979bd8d3b4446fb162ead

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

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 66955da..bd4d691 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -130,11 +130,9 @@
 
 static const char* const kDefaultLdPaths[] = {
 #if defined(__LP64__)
-  "/odm/lib64",
   "/vendor/lib64",
   "/system/lib64",
 #else
-  "/odm/lib",
   "/vendor/lib",
   "/system/lib",
 #endif
@@ -143,15 +141,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",