commit 3e8584d4a7d617289e8a954711ba895415d781c4
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 04 00:32:47 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 04 00:32:47 2017 +0000
tree fb5d64dfdb47a32ae14262592ee2dde264f6dade
parent 42f3bd0ffc3f0f0e3191c679ea4276f7f1882a00
parent 1a524d62481d1af061b9bdd4f06c5409d3bc4b93

Merge "Revert "linker: disable ld.config.txt in ASAN mode""

linker/linker_config.cpp

diff --git a/linker/linker_config.cpp b/linker/linker_config.cpp
index f6d5072..e036c05 100644
--- a/linker/linker_config.cpp
+++ b/linker/linker_config.cpp
@@ -375,15 +375,6 @@
                                       bool is_asan,
                                       const Config** config,
                                       std::string* error_msg) {
-  // TODO(b/38114603) Currently, multiple namespaces does not support ASAN mode
-  // where some symbols should be intercepted via LD_PRELOAD; LD_PRELOADed libs
-  // are not being preloaded into the linked namespaces other than the default
-  // namespace. Until we fix the problem, we temporarily disable ld.config.txt
-  // in ASAN mode.
-  if (is_asan) {
-    return false;
-  }
-
   g_config.clear();
 
   std::unordered_map<std::string, PropertyValue> property_map;

linker/tests/linker_config_test.cpp

diff --git a/linker/tests/linker_config_test.cpp b/linker/tests/linker_config_test.cpp
index 87609d0..c6fade9 100644
--- a/linker/tests/linker_config_test.cpp
+++ b/linker/tests/linker_config_test.cpp
@@ -168,7 +168,6 @@
   run_linker_config_smoke_test(false);
 }
 
-// TODO(b/38114603) revive this test when ld.config.txt is enabled for ASAN mode
-//TEST(linker_config, asan_smoke) {
-//  run_linker_config_smoke_test(true);
-//}
+TEST(linker_config, asan_smoke) {
+  run_linker_config_smoke_test(true);
+}