pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "linker: add more directories to default lib paths" 

This reverts commit 1daa18e737.

To be replaced with customized linker-namespaces for different kind of binaries.

Bug: http://b/34407260
Change-Id: Ib4e480669bbdf44ee4f59bf05f07d3e082c348c9
Test: m
This commit is contained in:
Dimitry Ivanov 2017-03-17 00:08:23 +00:00
parent 1daa18e737
commit a144697500
1 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
linker/linker.cpp
View File

@ -78,39 +78,19 @@ static LinkerTypeAllocator<android_namespace_t> g_namespace_allocator;
static LinkerTypeAllocator<LinkedListEntry<android_namespace_t>> g_namespace_list_allocator; static LinkerTypeAllocator<LinkedListEntry<android_namespace_t>> g_namespace_list_allocator;
#if defined(__LP64__) #if defined(__LP64__)
static const char* const kSystemLibDir = "/system/lib64"; static const char* const kSystemLibDir = "/system/lib64";
static const char* const kSystemNdkLibDir = "/system/lib64/ndk"; static const char* const kVendorLibDir = "/vendor/lib64";
static const char* const kSystemVndkLibDir = "/system/lib64/vndk"; static const char* const kAsanSystemLibDir = "/data/lib64";
static const char* const kSystemVndkExtLibDir = "/system/lib64/vndk-ext"; static const char* const kAsanVendorLibDir = "/data/vendor/lib64";
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";
#else #else
static const char* const kSystemLibDir = "/system/lib"; static const char* const kSystemLibDir = "/system/lib";
static const char* const kSystemNdkLibDir = "/system/lib/ndk"; static const char* const kVendorLibDir = "/vendor/lib";
static const char* const kSystemVndkLibDir = "/system/lib/vndk"; static const char* const kAsanSystemLibDir = "/data/lib";
static const char* const kSystemVndkExtLibDir = "/system/lib/vndk-ext"; static const char* const kAsanVendorLibDir = "/data/vendor/lib";
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";
#endif #endif
static const char* const kDefaultLdPaths[] = { static const char* const kDefaultLdPaths[] = {
kSystemLibDir, kSystemLibDir,
kSystemNdkLibDir,
kSystemVndkExtLibDir,
kSystemVndkLibDir,
kVendorSpHalLibDir,
kVendorLibDir, kVendorLibDir,
nullptr nullptr
}; };
@ -118,14 +98,6 @@ static const char* const kDefaultLdPaths[] = {
static const char* const kAsanDefaultLdPaths[] = { static const char* const kAsanDefaultLdPaths[] = {
kAsanSystemLibDir, kAsanSystemLibDir,
kSystemLibDir, kSystemLibDir,
kAsanSystemNdkLibDir,
kSystemNdkLibDir,
kAsanSystemVndkExtLibDir,
kSystemVndkExtLibDir,
kAsanSystemVndkLibDir,
kSystemVndkLibDir,
kAsanVendorSpHalLibDir,
kVendorSpHalLibDir,
kAsanVendorLibDir, kAsanVendorLibDir,
kVendorLibDir, kVendorLibDir,
nullptr nullptr