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

Side by Side Diff: chrome/browser_tests.isolate

Issue 1069273002: Revert of Copy Widevine files for swarming tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | « build/isolate.gypi ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 ['use_x11==0', { 6 ['use_x11==0', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/test_env.py', 9 '../testing/test_env.py',
10 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
(...skipping 23 matching lines...) Expand all
34 }], 34 }],
35 ['OS=="linux"', { 35 ['OS=="linux"', {
36 'variables': { 36 'variables': {
37 'files': [ 37 'files': [
38 '<(PRODUCT_DIR)/libclearkeycdm.so', 38 '<(PRODUCT_DIR)/libclearkeycdm.so',
39 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', 39 '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
40 '<(PRODUCT_DIR)/libppapi_tests.so', 40 '<(PRODUCT_DIR)/libppapi_tests.so',
41 ], 41 ],
42 }, 42 },
43 }], 43 }],
44 ['OS=="linux" and branding=="Chrome" and enable_pepper_cdms==1', {
45 'variables': {
46 'files': [
47 '<(PRODUCT_DIR)/libwidevinecdm.so',
48 '<(PRODUCT_DIR)/libwidevinecdmadapter.so',
49 ],
50 },
51 }],
52 ['OS=="linux" and libpeer_target_type=="loadable_module"', { 44 ['OS=="linux" and libpeer_target_type=="loadable_module"', {
53 'variables': { 45 'variables': {
54 'files': [ 46 'files': [
55 '<(PRODUCT_DIR)/lib/libpeerconnection.so', 47 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
56 ], 48 ],
57 }, 49 },
58 }], 50 }],
59 ['OS=="linux" or OS=="mac" or OS=="win"', { 51 ['OS=="linux" or OS=="mac" or OS=="win"', {
60 'variables': { 52 'variables': {
61 'files': [ 53 'files': [
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', 175 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
184 '<(PRODUCT_DIR)/content_shell.pak', 176 '<(PRODUCT_DIR)/content_shell.pak',
185 '<(PRODUCT_DIR)/libclearkeycdm.dylib', 177 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
186 '<(PRODUCT_DIR)/osmesa.so', 178 '<(PRODUCT_DIR)/osmesa.so',
187 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/', 179 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
188 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/', 180 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',
189 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', 181 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
190 ], 182 ],
191 }, 183 },
192 }], 184 }],
193 ['OS=="mac" and branding=="Chrome" and enable_pepper_cdms==1', {
194 'variables': {
195 'files': [
196 '<(PRODUCT_DIR)/libwidevinecdm.dylib',
197 '<(PRODUCT_DIR)/widevinecdmadapter.plugin/',
198 ],
199 },
200 }],
201 ['OS=="win"', { 185 ['OS=="win"', {
202 'variables': { 186 'variables': {
203 'files': [ 187 'files': [
204 '../native_client/build/build_nexe.py', 188 '../native_client/build/build_nexe.py',
205 '<(PRODUCT_DIR)/chrome_elf.dll', 189 '<(PRODUCT_DIR)/chrome_elf.dll',
206 '<(PRODUCT_DIR)/clearkeycdm.dll', 190 '<(PRODUCT_DIR)/clearkeycdm.dll',
207 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', 191 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
208 '<(PRODUCT_DIR)/plugins/', 192 '<(PRODUCT_DIR)/plugins/',
209 '<(PRODUCT_DIR)/ppapi_tests.dll', 193 '<(PRODUCT_DIR)/ppapi_tests.dll',
210 'tools/build/repack_locales.py', 194 'tools/build/repack_locales.py',
211 ], 195 ],
212 }, 196 },
213 }], 197 }],
214 ['OS=="win" and branding=="Chrome" and enable_pepper_cdms==1', {
215 'variables': {
216 'files': [
217 '<(PRODUCT_DIR)/widevinecdm.dll',
218 '<(PRODUCT_DIR)/widevinecdmadapter.dll',
219 ],
220 },
221 }],
222 ['OS=="win" and target_arch=="ia32"', { 198 ['OS=="win" and target_arch=="ia32"', {
223 'variables': { 199 'variables': {
224 'files': [ 200 'files': [
225 '<(PRODUCT_DIR)/wow_helper.exe', 201 '<(PRODUCT_DIR)/wow_helper.exe',
226 ], 202 ],
227 }, 203 },
228 }], 204 }],
229 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 205 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
230 'variables': { 206 'variables': {
231 'files': [ 207 'files': [
(...skipping 30 matching lines...) Expand all
262 'browser/chromeos/login/test/https_forwarder.py', 238 'browser/chromeos/login/test/https_forwarder.py',
263 ], 239 ],
264 }, 240 },
265 }], 241 }],
266 ], 242 ],
267 'includes': [ 243 'includes': [
268 '../base/base.isolate', 244 '../base/base.isolate',
269 'chrome.isolate', 245 'chrome.isolate',
270 ], 246 ],
271 } 247 }
OLDNEW
« no previous file with comments | « build/isolate.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698