Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Side by Side Diff: content/content_browsertests.isolate

Issue 580683003: Include content_shell.pak for linux and windows swarming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/content_unittests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'conditions': [ 5 'conditions': [
6 ['OS=="android"', { 6 ['OS=="android"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_tracked': [ 8 'isolate_dependency_tracked': [
9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', 9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
10 ], 10 ],
11 }, 11 },
12 }], 12 }],
13 ['chromeos==1', { 13 ['chromeos==1', {
14 'variables': { 14 'variables': {
15 'isolate_dependency_tracked': [ 15 'isolate_dependency_tracked': [
16 '<(PRODUCT_DIR)/content_shell.pak', 16 '<(PRODUCT_DIR)/content_shell.pak',
17 ], 17 ],
18 }, 18 },
19 }], 19 }],
20 ['OS=="mac"', { 20 ['OS=="linux" or OS=="mac" or OS=="win"', {
21 'variables': { 21 'variables': {
22 'isolate_dependency_tracked': [ 22 'isolate_dependency_tracked': [
23 '<(PRODUCT_DIR)/content_shell.pak', 23 '<(PRODUCT_DIR)/content_shell.pak',
24 ], 24 ],
25 }, 25 },
26 }], 26 }],
27 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 27 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
28 'variables': { 28 'variables': {
29 'isolate_dependency_untracked': [ 29 'isolate_dependency_untracked': [
30 '../media/test/data/', 30 '../media/test/data/',
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 'isolate_dependency_untracked': [ 102 'isolate_dependency_untracked': [
103 '<(PRODUCT_DIR)/content_browsertests.exe.pdb', 103 '<(PRODUCT_DIR)/content_browsertests.exe.pdb',
104 ], 104 ],
105 }, 105 },
106 }], 106 }],
107 ], 107 ],
108 'includes': [ 108 'includes': [
109 '../third_party/icu/icu.isolate', 109 '../third_party/icu/icu.isolate',
110 ], 110 ],
111 } 111 }
OLDNEW
« no previous file with comments | « no previous file | content/content_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698