Chromium Code Reviews| Index: base/base.isolate |
| diff --git a/base/base.isolate b/base/base.isolate |
| index 021c01cda1012cf0b02524de722c7fd224c264f6..a6b7b14e1c885f409bf37ffcde63807851e82e37 100644 |
| --- a/base/base.isolate |
| +++ b/base/base.isolate |
| @@ -9,13 +9,20 @@ |
| '../third_party/icu/icu.isolate', |
| ], |
| 'conditions': [ |
| - ['OS=="linux" and asan==1 and chromeos==0', { |
| + ['use_custom_libcxx==1', { |
| 'variables': { |
| 'files': [ |
| '<(PRODUCT_DIR)/lib/libc++.so', |
| ], |
| }, |
| }], |
| + ['use_instrumented_libraries==1', { |
| + 'variables': { |
| + 'files': [ |
| + '<(PRODUCT_DIR)/instrumented_libraries/', |
| + ], |
| + }, |
| + }], |
| ['OS=="mac" and asan==1', { |
| 'variables': { |
| 'files': [ |
| @@ -30,7 +37,7 @@ |
| ], |
| }, |
| }], |
| - ['OS=="linux" and asan==1', { |
| + ['OS=="linux" and (asan==1 or lsan==1 or msan==1 or tsan==1)', { |
|
M-A Ruel
2015/02/03 18:54:13
:)
|
| 'variables': { |
| 'files': [ |
| # For llvm-symbolizer. |
| @@ -38,7 +45,7 @@ |
| ], |
| }, |
| }], |
| - ['asan==1', { |
| + ['asan==1 or lsan==1 or msan==1 or tsan==1', { |
| 'variables': { |
| 'files': [ |
| '../tools/valgrind/asan/', |