Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / base / base.isolate

diff --git a/src/base/base.isolate b/src/base/base.isolate
index 03c45a1..0416935 100644 (file)
--- a/src/base/base.isolate
+++ b/src/base/base.isolate
@@ -9,26 +9,57 @@
     '../third_party/icu/icu.isolate',
   ],
   'conditions': [
-    ['OS=="linux" and asan==1', {
+    ['OS=="linux" and asan==1 and chromeos==0', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/lib/libc++.so',
         ],
       },
     }],
+    ['OS=="mac" and asan==1', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib',
+        ],
+      },
+    }],
+    ['OS=="linux" and asan==1', {
+      'variables': {
+        'files': [
+          '../third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6',
+        ],
+      },
+    }],
+    ['asan==1', {
+      'variables': {
+        'files': [
+          '../tools/valgrind/asan/',
+          '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer',
+        ],
+      },
+    }],
+    ['lsan==1', {
+      'variables': {
+        'files': [
+          '../tools/lsan/suppressions.txt',
+        ],
+      },
+    }],
     ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           # Copy the VS runtime DLLs into the isolate so that they
           # don't have to be preinstalled on the target machine.
           '<(PRODUCT_DIR)/msvcp120d.dll',
           '<(PRODUCT_DIR)/msvcr120d.dll',
+          '<(PRODUCT_DIR)/x64/msvcp120d.dll',
+          '<(PRODUCT_DIR)/x64/msvcr120d.dll',
         ],
       },
     }],
     ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           # Copy the VS runtime DLLs into the isolate so that they
           # don't have to be preinstalled on the target machine.
           '<(PRODUCT_DIR)/msvcp120.dll',