diff options
| author | vivek.vg <vivek.vg@samsung.com> | 2014-09-19 09:14:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-19 16:15:07 +0000 |
| commit | 968b94fac3690032c9ceb66af4cb49d0e9b0a419 (patch) | |
| tree | 63825bbd6f16bafb8eea16367f2c61ad547ea4be /content | |
| parent | 25606073cbdfc4772a0caaa23a624a83293fbadc (diff) | |
| download | chromium_src-968b94fac3690032c9ceb66af4cb49d0e9b0a419.zip chromium_src-968b94fac3690032c9ceb66af4cb49d0e9b0a419.tar.gz chromium_src-968b94fac3690032c9ceb66af4cb49d0e9b0a419.tar.bz2 | |
Include content_shell.pak for linux and windows swarming.
Apparently these are also required for the swarming phase of
tests.
BUG=312586
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/580683003
Cr-Commit-Position: refs/heads/master@{#295717}
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_browsertests.isolate | 2 | ||||
| -rw-r--r-- | content/content_unittests.isolate | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index c3e0a2a..abf151f 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -17,7 +17,7 @@ ], }, }], - ['OS=="mac"', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/content_shell.pak', diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index ae821ba..1303b98 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -18,7 +18,7 @@ ], }, }], - ['OS=="mac" or OS=="win"', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/content_shell.pak', |