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

Side by Side Diff: chrome/browser_tests.isolate

Issue 2002043003: browser_tests.isolate: fix paths to the widevinecdm files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 'variables': { 231 'variables': {
232 'files': [ 232 'files': [
233 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdm.dll ', 233 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdm.dll ',
234 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdmadap ter.dll', 234 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdmadap ter.dll',
235 ], 235 ],
236 }, 236 },
237 }], 237 }],
238 ['OS=="win" and target_arch=="ia32" and branding=="Chrome" and enable_pepper _cdms==1', { 238 ['OS=="win" and target_arch=="ia32" and branding=="Chrome" and enable_pepper _cdms==1', {
239 'variables': { 239 'variables': {
240 'files': [ 240 'files': [
241 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/clearkeycdm.dll ', 241 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/widevinecdm.dll ',
242 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/clearkeycdmadap ter.dll', 242 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/widevinecdmadap ter.dll',
243 ], 243 ],
244 }, 244 },
245 }], 245 }],
246 ['OS=="win" and target_arch=="x64" and branding=="Chrome" and enable_pepper_ cdms==1', { 246 ['OS=="win" and target_arch=="x64" and branding=="Chrome" and enable_pepper_ cdms==1', {
247 'variables': { 247 'variables': {
248 'files': [ 248 'files': [
249 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/clearkeycdm.dll ', 249 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/widevinecdm.dll ',
250 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/clearkeycdmadap ter.dll', 250 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/widevinecdmadap ter.dll',
251 ], 251 ],
252 }, 252 },
253 }], 253 }],
254 ['OS=="win" and target_arch=="ia32"', { 254 ['OS=="win" and target_arch=="ia32"', {
255 'variables': { 255 'variables': {
256 'files': [ 256 'files': [
257 '<(PRODUCT_DIR)/wow_helper.exe', 257 '<(PRODUCT_DIR)/wow_helper.exe',
258 ], 258 ],
259 }, 259 },
260 }], 260 }],
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 'browser/chromeos/login/test/https_forwarder.py', 295 'browser/chromeos/login/test/https_forwarder.py',
296 ], 296 ],
297 }, 297 },
298 }], 298 }],
299 ], 299 ],
300 'includes': [ 300 'includes': [
301 '../base/base.isolate', 301 '../base/base.isolate',
302 'chrome.isolate', 302 'chrome.isolate',
303 ], 303 ],
304 } 304 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698