summaryrefslogtreecommitdiff
path: root/linker/linker.cpp
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2015-12-09 19:35:02 +0000
committerDimitry Ivanov <dimitry@google.com>2015-12-09 19:35:02 +0000
commit40728bccbcba5ff1bf5979bd8d3b4446fb162ead (patch)
treef09ce774b7eb4fabf10f41a998d91864249175d4 /linker/linker.cpp
parentf74b041cce75091b922151d4fa57e63c8a6caf4b (diff)
Revert "Add /odm/lib to shared lib search path"
This reverts commit f74b041cce75091b922151d4fa57e63c8a6caf4b. Bug: 25654402 Change-Id: I77386ea3655868d7cd1a8130afbc95e70549389e
Diffstat (limited to 'linker/linker.cpp')
-rw-r--r--linker/linker.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp
index e9ec69dfd..8b678ffb5 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -125,11 +125,9 @@ 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
@@ -138,15 +136,11 @@ 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",