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

Merge "Load /dev/linker/ld.config.txt by default"

Browse source 
am: 9615e0ddac

Change-Id: I40f2a3ed101e2677ab7805a000feb2c9c2763425
This commit is contained in:
Kiyoung Kim 2019-10-27 21:36:25 -07:00 committed by android-build-merger
commit 05b0aeeb5f
1 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
linker/linker.cpp
View file

@ -92,7 +92,6 @@ static uint64_t g_module_unload_counter = 0;
static const char* const kLdConfigArchFilePath = "/system/etc/ld.config." ABI_STRING ".txt";
static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt";
static const char* const kLdConfigVndkLiteFilePath = "/system/etc/ld.config.vndk_lite.txt";
static const char* const kLdGeneratedConfigFilePath = "/dev/linkerconfig/ld.config.txt";
@ -4054,30 +4053,13 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
}
static std::string get_ld_config_file_vndk_path() {
if (android::base::GetBoolProperty("ro.vndk.lite", false)) {
return kLdConfigVndkLiteFilePath;
if (!file_exists(kLdGeneratedConfigFilePath)) {
DL_WARN("Warning: failed to find generated linker configuration from \"%s\"",
kLdGeneratedConfigFilePath);
return "";
}
// 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) {
insert_pos = ld_config_file_vndk.length();
}
ld_config_file_vndk.insert(insert_pos, Config::get_vndk_version_string('.'));
return ld_config_file_vndk;
return kLdGeneratedConfigFilePath;
}
static std::string get_ld_config_file_path(const char* executable_path) {
@ -4105,7 +4087,7 @@ static std::string get_ld_config_file_path(const char* executable_path) {
}
path = get_ld_config_file_vndk_path();
if (file_exists(path.c_str())) {
if (!path.empty()) {
return path;
}