commit 0a451314b0bb3af51e34659ade322be58c434127
author Elliott Hughes <enh@google.com> Thu Oct 05 20:45:39 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 05 20:45:39 2017 +0000
tree ed837e8585a298c20037758a32bb133e7ad148e8
parent 7c6784061dca3e36b6c80973573a0bea8896d585
parent 3a8f75d8b052611c08ef17ecf625b8021f4e0229

Merge "POSIX clock cleanup."

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);
+}

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 25af05e..fb8b886 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -169,7 +169,7 @@
     ],
 
     target: {
-        android: {
+        bionic: {
             whole_static_libs: ["libasync_safe"],
         },
     },
@@ -618,6 +618,12 @@
     sanitize: {
         never: false,
     },
+
+    target: {
+        linux_bionic: {
+            enabled: false,
+        },
+    },
 }
 
 subdirs = ["libs"]