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

Side by Side Diff: content/content_browsertests.isolate

Issue 399693002: Add media/test/data to content_browsertests and browser_tests isolate files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser_tests.isolate ('k') | no next file » | 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 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 13 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
14 'variables': { 14 'variables': {
15 'isolate_dependency_untracked': [ 15 'isolate_dependency_untracked': [
16 '../media/test/data/',
16 '../net/data/', 17 '../net/data/',
17 'test/data/', 18 'test/data/',
18 ], 19 ],
19 }, 20 },
20 }], 21 }],
21 ['OS=="linux"', { 22 ['OS=="linux"', {
22 'variables': { 23 'variables': {
23 'command': [ 24 'command': [
24 '../testing/xvfb.py', 25 '../testing/xvfb.py',
25 '<(PRODUCT_DIR)', 26 '<(PRODUCT_DIR)',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 '<(PRODUCT_DIR)/clearkeycdm.dll', 85 '<(PRODUCT_DIR)/clearkeycdm.dll',
85 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', 86 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
86 '<(PRODUCT_DIR)/content_shell.pak', 87 '<(PRODUCT_DIR)/content_shell.pak',
87 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll', 88 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
88 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 89 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
89 ], 90 ],
90 }, 91 },
91 }], 92 }],
92 ], 93 ],
93 } 94 }
OLDNEW
« no previous file with comments | « chrome/browser_tests.isolate ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698