diff options
| -rw-r--r-- | build/android/pylib/utils/isolator.py | 1 | ||||
| -rw-r--r-- | build/isolate.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome.isolate | 7 | ||||
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 7 | ||||
| -rw-r--r-- | chrome/sync_integration_tests.isolate | 7 | ||||
| -rw-r--r-- | chrome/unit_tests.isolate | 7 |
6 files changed, 30 insertions, 0 deletions
diff --git a/build/android/pylib/utils/isolator.py b/build/android/pylib/utils/isolator.py index 90d5ca0..cac39d8 100644 --- a/build/android/pylib/utils/isolator.py +++ b/build/android/pylib/utils/isolator.py @@ -36,6 +36,7 @@ def DefaultConfigVariables(): 'enable_plugins': '0', 'fastbuild': '0', 'icu_use_data_file_flag': '1', + 'kasko': '0', 'lsan': '0', 'msan': '0', # TODO(maruel): This may not always be true. diff --git a/build/isolate.gypi b/build/isolate.gypi index 7b050e2..10033da 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -88,6 +88,7 @@ # once support for user-defined config variables is added. '--config-variable', 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', + '--config-variable', 'kasko=<(kasko)', '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', '--config-variable', 'lsan=<(lsan)', '--config-variable', 'msan=<(msan)', diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 34aef09..e4dd9ef 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -123,6 +123,13 @@ ], }, }], + ['OS=="win" and kasko==1', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/kasko.dll', + ], + }, + }], ], 'includes': [ '../base/base.isolate', diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 9823d0c..0e37609 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -121,6 +121,13 @@ ], }, }], + ['OS=="win" and kasko==1', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/kasko.dll', + ], + }, + }], ['chromeos==1', { 'variables': { 'files': [ diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 06741e3..3ff1056 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -97,6 +97,13 @@ ], }, }], + ['OS=="win" and kasko==1', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/kasko.dll', + ], + }, + }], ['chromeos==1', { 'variables': { 'files': [ diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index 33821eb..146ca41 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -144,6 +144,13 @@ ], }, }], + ['OS=="win" and kasko==1', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/kasko.dll', + ], + }, + }], ['chromeos==1', { 'variables': { 'files': [ |