summaryrefslogtreecommitdiff
path: root/linker/linker.cpp
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2015-12-10 20:17:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-12-10 20:17:02 +0000
commitcb025e55f707216eb36b07f6fc36dcf604a45c07 (patch)
tree75f49029f558b2f745119ded1e0a655cabe8f3b3 /linker/linker.cpp
parent9d8632e1a76de6bd6abc853c0fbd6a2c9dc32cdc (diff)
parent40728bccbcba5ff1bf5979bd8d3b4446fb162ead (diff)
Merge "Revert "Add /odm/lib to shared lib search path""
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 66955da15..bd4d6915e 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -130,11 +130,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
@@ -143,15 +141,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",