commit 8bad646e8dae16b47fa1c6ee1213f76df3046739
author Dimitry Ivanov <dimitry@google.com> Thu Dec 10 12:23:34 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 12:23:34 2015 -0800
tree 75f49029f558b2f745119ded1e0a655cabe8f3b3
parent a13d5748a4dc3ca35ad590844fa231b0f929f2c7
parent cb025e55f707216eb36b07f6fc36dcf604a45c07

Merge "Revert "Add /odm/lib to shared lib search path""
am: cb025e55f7

* commit 'cb025e55f707216eb36b07f6fc36dcf604a45c07':
  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",