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

Merge "Enable linker configuration from generator by default"

Browse source
This commit is contained in:
Kiyoung Kim 2019-12-16 01:55:44 +00:00 committed by Gerrit Code Review
commit 838ca10715
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
linker/linker.cpp
View file

@ -4054,19 +4054,6 @@ static std::string get_ld_config_file_vndk_path() {
return kLdConfigVndkLiteFilePath;
}
// Use generated linker config if flag is set
// TODO(b/138920271) Do not check property once it is confirmed as stable
// TODO(b/139638519) This file should also cover legacy or vndk-lite config
if (android::base::GetProperty("ro.vndk.version", "") != "" &&
android::base::GetBoolProperty("sys.linker.use_generated_config", true)) {
if (file_exists(kLdGeneratedConfigFilePath)) {
return kLdGeneratedConfigFilePath;
} else {
DL_WARN("Warning: failed to find generated linker configuration from \"%s\"",
kLdGeneratedConfigFilePath);
}
}
std::string ld_config_file_vndk = kLdConfigFilePath;
size_t insert_pos = ld_config_file_vndk.find_last_of('.');
if (insert_pos == std::string::npos) {
@ -4095,6 +4082,18 @@ static std::string get_ld_config_file_path(const char* executable_path) {
path.c_str(), executable_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)) {
if (file_exists(kLdGeneratedConfigFilePath)) {
return kLdGeneratedConfigFilePath;
} else {
DL_WARN("Warning: failed to find generated linker configuration from \"%s\"",
kLdGeneratedConfigFilePath);
}
}
path = kLdConfigArchFilePath;
if (file_exists(path.c_str())) {
return path;