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

Merge "Prefer arch-specific linker config when available"

Browse source
This commit is contained in:
Evgeny Eltsin 2019-12-16 19:59:14 +00:00 committed by Gerrit Code Review
commit 5761dd85b6
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
linker/linker.cpp
View file

@ -4082,6 +4082,11 @@ static std::string get_ld_config_file_path(const char* executable_path) {
path.c_str(), executable_path);
}
path = kLdConfigArchFilePath;
if (file_exists(path.c_str())) {
return path;
}
// Use generated linker config if flag is set
// TODO(b/138920271) Do not check property once it is confirmed as stable
if (android::base::GetBoolProperty("sys.linker.use_generated_config", true)) {
@ -4093,12 +4098,6 @@ static std::string get_ld_config_file_path(const char* executable_path) {
}
}
path = kLdConfigArchFilePath;
if (file_exists(path.c_str())) {
return path;
}
path = get_ld_config_file_vndk_path();
if (file_exists(path.c_str())) {
return path;