diff options
author | Kiyoung Kim <kiyoungkim@google.com> | 2020-02-12 07:47:37 +0900 |
---|---|---|
committer | Kiyoung Kim <kiyoungkim@google.com> | 2020-02-15 04:35:37 +0900 |
commit | 1878690fddf780e2e4fd7753b77c7e2bc3c293be (patch) | |
tree | eb92088c35c1325a16a4f3c1360b5ff5e2222389 | |
parent | 97d053283f4c100baed8677f7a7af98a976a2e2f (diff) |
Deprecate sys.linker.use_generated_config property
sys.linker.use_generated_config property was introduced at the beginning
of linkerconfig development to skip this generated configuration if it
does not work properly during dev. However, linkerconfig development is
now completed and is working properly from most of devices, so this
property is no longer in use. Therefore deprecating this property as
this would not be used.
Bug: 149335054
Test: m -j passed
Test: No linking error from Cuttlefish and Crosshatch
Change-Id: I0a1b3f36b69872862196b1613718a75d482e0a92
-rw-r--r-- | linker/linker.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 0e682592a..3eb064c22 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -3498,16 +3498,12 @@ static std::string get_ld_config_file_path(const char* executable_path) { 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)) { - 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); - } + 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); } path = get_ld_config_file_vndk_path(); |