diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2017-03-17 00:08:23 +0000 |
|---|---|---|
| committer | Dimitry Ivanov <dimitry@google.com> | 2017-03-17 00:08:23 +0000 |
| commit | a1446975005a3aeed6e90defa96eab938602b7c5 (patch) | |
| tree | 4d6e702a032dfeb2bbe071f12ca614426323e432 /linker/linker.cpp | |
| parent | 1daa18e73714150e26c4380840c793e406c11095 (diff) | |
Revert "linker: add more directories to default lib paths"
This reverts commit 1daa18e73714150e26c4380840c793e406c11095.
To be replaced with customized linker-namespaces for different kind of binaries.
Bug: http://b/34407260
Change-Id: Ib4e480669bbdf44ee4f59bf05f07d3e082c348c9
Test: m
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 44 |
1 files changed, 8 insertions, 36 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 7740aa981..a3d1db2c4 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -78,39 +78,19 @@ static LinkerTypeAllocator<android_namespace_t> g_namespace_allocator; static LinkerTypeAllocator<LinkedListEntry<android_namespace_t>> g_namespace_list_allocator; #if defined(__LP64__) -static const char* const kSystemLibDir = "/system/lib64"; -static const char* const kSystemNdkLibDir = "/system/lib64/ndk"; -static const char* const kSystemVndkLibDir = "/system/lib64/vndk"; -static const char* const kSystemVndkExtLibDir = "/system/lib64/vndk-ext"; -static const char* const kVendorSpHalLibDir = "/vendor/lib64/sameprocess"; -static const char* const kVendorLibDir = "/vendor/lib64"; -static const char* const kAsanSystemLibDir = "/data/lib64"; -static const char* const kAsanSystemNdkLibDir = "/data/lib64/ndk"; -static const char* const kAsanSystemVndkLibDir = "/data/lib64/vndk"; -static const char* const kAsanSystemVndkExtLibDir = "/data/lib64/vndk-ext"; -static const char* const kAsanVendorSpHalLibDir = "/data/vendor/lib64/sameprocess"; -static const char* const kAsanVendorLibDir = "/data/vendor/lib64"; +static const char* const kSystemLibDir = "/system/lib64"; +static const char* const kVendorLibDir = "/vendor/lib64"; +static const char* const kAsanSystemLibDir = "/data/lib64"; +static const char* const kAsanVendorLibDir = "/data/vendor/lib64"; #else -static const char* const kSystemLibDir = "/system/lib"; -static const char* const kSystemNdkLibDir = "/system/lib/ndk"; -static const char* const kSystemVndkLibDir = "/system/lib/vndk"; -static const char* const kSystemVndkExtLibDir = "/system/lib/vndk-ext"; -static const char* const kVendorSpHalLibDir = "/vendor/lib/sameprocess"; -static const char* const kVendorLibDir = "/vendor/lib"; -static const char* const kAsanSystemLibDir = "/data/lib"; -static const char* const kAsanSystemNdkLibDir = "/data/lib/ndk"; -static const char* const kAsanSystemVndkLibDir = "/data/lib/vndk"; -static const char* const kAsanSystemVndkExtLibDir = "/data/lib/vndk-ext"; -static const char* const kAsanVendorSpHalLibDir = "/data/vendor/lib/sameprocess"; -static const char* const kAsanVendorLibDir = "/data/vendor/lib"; +static const char* const kSystemLibDir = "/system/lib"; +static const char* const kVendorLibDir = "/vendor/lib"; +static const char* const kAsanSystemLibDir = "/data/lib"; +static const char* const kAsanVendorLibDir = "/data/vendor/lib"; #endif static const char* const kDefaultLdPaths[] = { kSystemLibDir, - kSystemNdkLibDir, - kSystemVndkExtLibDir, - kSystemVndkLibDir, - kVendorSpHalLibDir, kVendorLibDir, nullptr }; @@ -118,14 +98,6 @@ static const char* const kDefaultLdPaths[] = { static const char* const kAsanDefaultLdPaths[] = { kAsanSystemLibDir, kSystemLibDir, - kAsanSystemNdkLibDir, - kSystemNdkLibDir, - kAsanSystemVndkExtLibDir, - kSystemVndkExtLibDir, - kAsanSystemVndkLibDir, - kSystemVndkLibDir, - kAsanVendorSpHalLibDir, - kVendorSpHalLibDir, kAsanVendorLibDir, kVendorLibDir, nullptr |