linker: add ld.config.txt parse time to systrace.
Bug: http://b/172640358
Test: treehugger
Change-Id: I9d6b7c1e200d2effb737508d3c282063edefa888
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 77f754c..2481be4 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3458,23 +3458,19 @@
const Config* config = nullptr;
- std::string error_msg;
-
- std::string ld_config_file_path = get_ld_config_file_path(executable_path);
-
- INFO("[ Reading linker config \"%s\" ]", ld_config_file_path.c_str());
- if (!Config::read_binary_config(ld_config_file_path.c_str(),
- executable_path,
- g_is_asan,
- &config,
- &error_msg)) {
- if (!error_msg.empty()) {
- DL_WARN("Warning: couldn't read \"%s\" for \"%s\" (using default configuration instead): %s",
- ld_config_file_path.c_str(),
- executable_path,
- error_msg.c_str());
+ {
+ std::string ld_config_file_path = get_ld_config_file_path(executable_path);
+ INFO("[ Reading linker config \"%s\" ]", ld_config_file_path.c_str());
+ ScopedTrace trace(("linker config " + ld_config_file_path).c_str());
+ std::string error_msg;
+ if (!Config::read_binary_config(ld_config_file_path.c_str(), executable_path, g_is_asan,
+ &config, &error_msg)) {
+ if (!error_msg.empty()) {
+ DL_WARN("Warning: couldn't read '%s' for '%s' (using default configuration instead): %s",
+ ld_config_file_path.c_str(), executable_path, error_msg.c_str());
+ }
+ config = nullptr;
}
- config = nullptr;
}
if (config == nullptr) {