tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Dimitry Ivanov 2017-03-25 07:46:18 +00:00 committed by Gerrit Code Review
commit 840ae69408
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

@ -81,39 +81,19 @@ static LinkerTypeAllocator<LinkedListEntry<android_namespace_t>> g_namespace_lis
static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt";
#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
};
@ -121,14 +101,6 @@ static const char* const kDefaultLdPaths[] = {
static const char* const kAsanDefaultLdPaths[] = {
kAsanSystemLibDir,
kSystemLibDir,
kAsanSystemNdkLibDir,
kSystemNdkLibDir,
kAsanSystemVndkExtLibDir,
kSystemVndkExtLibDir,
kAsanSystemVndkLibDir,
kSystemVndkLibDir,
kAsanVendorSpHalLibDir,
kVendorSpHalLibDir,
kAsanVendorLibDir,
kVendorLibDir,
nullptr