summaryrefslogtreecommitdiff
path: root/linker/linker.cpp
diff options
context:
space:
mode:
authorKiyoung Kim <kiyoungkim@google.com>2020-03-16 13:22:27 +0900
committerKiyoung Kim <kiyoungkim@google.com>2020-03-17 09:52:55 +0900
commit8bc0353dbcffc76b7e847de13056c1e802995916 (patch)
treeb7b1e1ab011ee96b7a77ae40075b1497bd934d2a /linker/linker.cpp
parent69046e084236393ce6a65e5e6c7feba8776e5664 (diff)
Update linkerconfig missing message to warning
Update message that generated linker configuration is missing to from into to warning again. Also do not raise this message from host environment which is expected. Bug: 146386369 Test: m -j passed Change-Id: Ia5c2969d77fbc70e0406fbb449920080989a1ea8
Diffstat (limited to 'linker/linker.cpp')
-rw-r--r--linker/linker.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 15b6a40ff..8eb72dc61 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3450,12 +3450,15 @@ static std::string get_ld_config_file_path(const char* executable_path) {
if (file_exists(kLdGeneratedConfigFilePath)) {
return kLdGeneratedConfigFilePath;
- } else {
- // TODO(b/146386369) : Adjust log level and add more condition to log only when necessary
- INFO("Warning: failed to find generated linker configuration from \"%s\"",
- kLdGeneratedConfigFilePath);
}
+ // Do not raise message from a host environment which is expected to miss generated linker
+ // configuration.
+#if defined(__ANDROID__)
+ DL_WARN("Warning: failed to find generated linker configuration from \"%s\"",
+ kLdGeneratedConfigFilePath);
+#endif
+
path = get_ld_config_file_vndk_path();
if (file_exists(path.c_str())) {
return path;