diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2014-10-17 15:55:44 -0700 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2014-10-17 22:57:01 +0000 |
| commit | 7f6805bd9257180e07cb6924ea41bcb76cfa462b (patch) | |
| tree | 173dfbd56d2a3c602f8c646de3cf46eea60c949c | |
| parent | fbe886d379caf66358093909908dad641a4e94ed (diff) | |
| download | chromium_src-7f6805bd9257180e07cb6924ea41bcb76cfa462b.zip chromium_src-7f6805bd9257180e07cb6924ea41bcb76cfa462b.tar.gz chromium_src-7f6805bd9257180e07cb6924ea41bcb76cfa462b.tar.bz2 | |
Fix swarming on Windows Vista.
wow_helper.exe is needed by the sandbox.
BUG=414808
TBR=maruel@chromium.org
Review URL: https://codereview.chromium.org/667513002
Cr-Commit-Position: refs/heads/master@{#300185}
| -rw-r--r-- | chrome/browser_tests.isolate | 7 | ||||
| -rw-r--r-- | chrome/chrome.isolate | 9 | ||||
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 7 | ||||
| -rw-r--r-- | chrome/sync_integration_tests.isolate | 7 | ||||
| -rw-r--r-- | content/content_browsertests.isolate | 7 |
5 files changed, 30 insertions, 7 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 5e35c34..ea1990a 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -164,6 +164,13 @@ ], }, }], + ['OS=="win" and target_arch=="ia32"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/wow_helper.exe', + ], + }, + }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { 'files': [ diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index d085936..5457f64 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -48,13 +48,6 @@ ], }, }], - ['OS=="win"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/chrome_200_percent.pak', - ], - }, - }], ['OS=="mac"', { 'variables': { 'command': [ @@ -73,6 +66,7 @@ 'variables': { 'files': [ '<(PRODUCT_DIR)/<(version_full).manifest', + '<(PRODUCT_DIR)/chrome_200_percent.pak', '<(PRODUCT_DIR)/chrome.dll', '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', @@ -86,6 +80,7 @@ 'files': [ '<(PRODUCT_DIR)/nacl64.exe', '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', + '<(PRODUCT_DIR)/wow_helper.exe', ], }, }], diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 3e271c6..9f2717d 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -88,6 +88,13 @@ ], }, }], + ['OS=="win" and target_arch=="ia32"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/wow_helper.exe', + ], + }, + }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { 'files': [ diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 03b0e59..4c01825 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -81,6 +81,13 @@ ], }, }], + ['OS=="win" and target_arch=="ia32"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/wow_helper.exe', + ], + }, + }], ['chromeos==1', { 'variables': { 'files': [ diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index 80b8bd1..ea3cf07 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -107,6 +107,13 @@ ], }, }], + ['OS=="win" and target_arch=="ia32"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/wow_helper.exe', + ], + }, + }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { 'files': [ |