diff options
| author | Andreas Gampe <agampe@google.com> | 2018-11-26 16:09:56 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2018-11-26 18:57:32 +0000 |
| commit | 27beebf6e502f9f562881dcf451741f46a48d778 (patch) | |
| tree | f1b94e925e18d7c8c6bfdd3f62aafbbce77347fa /linker/linker.cpp | |
| parent | d2dd37936111937c3662c0dd697142b9cc059643 (diff) | |
Revert "Add Android Runtime APEX directories to Bionic search paths."
This reverts commit d2dd37936111937c3662c0dd697142b9cc059643.
Reason for revert: Breaks vm-tests.
Bug: 119949783
Bug: 113373927
Change-Id: I2b23285ba98422a23da653d7ea99d9034000f6d6
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 3560b4e63..7993681d3 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -89,7 +89,6 @@ static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt"; static const char* const kLdConfigVndkLiteFilePath = "/system/etc/ld.config.vndk_lite.txt"; #if defined(__LP64__) -static const char* const kArtApexLibDir = "/apex/com.android.runtime/lib64"; static const char* const kSystemLibDir = "/system/lib64"; static const char* const kOdmLibDir = "/odm/lib64"; static const char* const kVendorLibDir = "/vendor/lib64"; @@ -97,7 +96,6 @@ static const char* const kAsanSystemLibDir = "/data/asan/system/lib64"; static const char* const kAsanOdmLibDir = "/data/asan/odm/lib64"; static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib64"; #else -static const char* const kArtApexLibDir = "/apex/com.android.runtime/lib"; static const char* const kSystemLibDir = "/system/lib"; static const char* const kOdmLibDir = "/odm/lib"; static const char* const kVendorLibDir = "/vendor/lib"; @@ -109,7 +107,6 @@ static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib"; static const char* const kAsanLibDirPrefix = "/data/asan"; static const char* const kDefaultLdPaths[] = { - kArtApexLibDir, kSystemLibDir, kOdmLibDir, kVendorLibDir, @@ -118,7 +115,6 @@ static const char* const kDefaultLdPaths[] = { static const char* const kAsanDefaultLdPaths[] = { kAsanSystemLibDir, - kArtApexLibDir, kSystemLibDir, kAsanOdmLibDir, kOdmLibDir, |