commit e2ac7e8b68fc01e88f0c062120e8147b0ba6da0a
author James Robinson <jamesr@chromium.org> Wed Oct 15 13:21:59 2014 -0700
committer James Robinson <jamesr@chromium.org> Wed Oct 15 13:21:59 2014 -0700
tree 9b3c302146e3b9766cf7c2583513417b0ade23fb
parent d5ac37c9367f06d66e18ef47849e6681d25c7807

Revved to chromium 4dfb55c9cf0950b8bac8b10070c9b8f3e7de66c2 refs/remotes/origin/HEAD

base/base.isolate

diff --git a/base/base.isolate b/base/base.isolate
index 047d5de..762d915 100644
--- a/base/base.isolate
+++ b/base/base.isolate
@@ -9,7 +9,7 @@
     '../third_party/icu/icu.isolate',
   ],
   'conditions': [
-    ['OS=="linux" and asan==1', {
+    ['OS=="linux" and asan==1 and chromeos==0', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/lib/libc++.so',
@@ -23,6 +23,22 @@
         ],
       },
     }],
+    ['asan==1', {
+      'variables': {
+        'files': [
+          '../tools/valgrind/asan/',
+          '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer',
+          '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6',
+        ],
+      },
+    }],
+    ['lsan==1', {
+      'variables': {
+        'files': [
+          '../tools/lsan/suppressions.txt',
+        ],
+      },
+    }],
     ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', {
       'variables': {
         'files': [