generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
This reverts commit f74b041cce75091b922151d4fa57e63c8a6caf4b.

Bug: 25654402
Change-Id: I77386ea3655868d7cd1a8130afbc95e70549389e
This commit is contained in:
Dimitry Ivanov 2015-12-09 19:35:02 +00:00
parent f74b041cce
commit 40728bccbc
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linker/linker.cpp
View File

@ -125,11 +125,9 @@ static soinfo* somain; // main process, always the one after libdl_info
static const char* const kDefaultLdPaths[] = { static const char* const kDefaultLdPaths[] = {
#if defined(__LP64__) #if defined(__LP64__)
"/odm/lib64",
"/vendor/lib64", "/vendor/lib64",
"/system/lib64", "/system/lib64",
#else #else
"/odm/lib",
"/vendor/lib", "/vendor/lib",
"/system/lib", "/system/lib",
#endif #endif
@ -138,15 +136,11 @@ static const char* const kDefaultLdPaths[] = {
static const char* const kAsanDefaultLdPaths[] = { static const char* const kAsanDefaultLdPaths[] = {
#if defined(__LP64__) #if defined(__LP64__)
"/data/odm/lib64",
"/odm/lib64",
"/data/vendor/lib64", "/data/vendor/lib64",
"/vendor/lib64", "/vendor/lib64",
"/data/lib64", "/data/lib64",
"/system/lib64", "/system/lib64",
#else #else
"/data/odm/lib",
"/odm/lib",
"/data/vendor/lib", "/data/vendor/lib",
"/vendor/lib", "/vendor/lib",
"/data/lib", "/data/lib",