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

Side by Side Diff: chrome/browser_tests.isolate

Issue 2028133002: media: Add Widevine CDM manifest.json in browser_tests.isolate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 'variables': { 193 'variables': {
194 'files': [ 194 'files': [
195 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x64/clearkeycdmadap ter.plugin', 195 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x64/clearkeycdmadap ter.plugin',
196 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x64/libclearkeycdm. dylib', 196 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x64/libclearkeycdm. dylib',
197 ], 197 ],
198 }, 198 },
199 }], 199 }],
200 ['OS=="mac" and target_arch=="x64" and branding=="Chrome" and enable_pepper_ cdms==1', { 200 ['OS=="mac" and target_arch=="x64" and branding=="Chrome" and enable_pepper_ cdms==1', {
201 'variables': { 201 'variables': {
202 'files': [ 202 'files': [
203 '<(PRODUCT_DIR)/WidevineCdm/manifest.json',
203 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x64/libwidevinecdm. dylib', 204 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x64/libwidevinecdm. dylib',
204 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x64/widevinecdmadap ter.plugin', 205 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x64/widevinecdmadap ter.plugin',
205 ], 206 ],
206 }, 207 },
207 }], 208 }],
208 ['OS=="win"', { 209 ['OS=="win"', {
209 'variables': { 210 'variables': {
210 'files': [ 211 'files': [
211 '../native_client/build/build_nexe.py', 212 '../native_client/build/build_nexe.py',
212 '<(PRODUCT_DIR)/chrome_elf.dll', 213 '<(PRODUCT_DIR)/chrome_elf.dll',
(...skipping 16 matching lines...) Expand all
229 'variables': { 230 'variables': {
230 'files': [ 231 'files': [
231 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdm.dll ', 232 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdm.dll ',
232 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdmadap ter.dll', 233 '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdmadap ter.dll',
233 ], 234 ],
234 }, 235 },
235 }], 236 }],
236 ['OS=="win" and target_arch=="ia32" and branding=="Chrome" and enable_pepper _cdms==1', { 237 ['OS=="win" and target_arch=="ia32" and branding=="Chrome" and enable_pepper _cdms==1', {
237 'variables': { 238 'variables': {
238 'files': [ 239 'files': [
240 '<(PRODUCT_DIR)/WidevineCdm/manifest.json',
239 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/widevinecdm.dll ', 241 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/widevinecdm.dll ',
240 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/widevinecdmadap ter.dll', 242 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/widevinecdmadap ter.dll',
241 ], 243 ],
242 }, 244 },
243 }], 245 }],
244 ['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', {
245 'variables': { 247 'variables': {
246 'files': [ 248 'files': [
249 '<(PRODUCT_DIR)/WidevineCdm/manifest.json',
247 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/widevinecdm.dll ', 250 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/widevinecdm.dll ',
248 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/widevinecdmadap ter.dll', 251 '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/widevinecdmadap ter.dll',
249 ], 252 ],
250 }, 253 },
251 }], 254 }],
252 ['OS=="win" and target_arch=="ia32"', { 255 ['OS=="win" and target_arch=="ia32"', {
253 'variables': { 256 'variables': {
254 'files': [ 257 'files': [
255 '<(PRODUCT_DIR)/wow_helper.exe', 258 '<(PRODUCT_DIR)/wow_helper.exe',
256 ], 259 ],
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 'browser/chromeos/login/test/https_forwarder.py', 296 'browser/chromeos/login/test/https_forwarder.py',
294 ], 297 ],
295 }, 298 },
296 }], 299 }],
297 ], 300 ],
298 'includes': [ 301 'includes': [
299 '../base/base.isolate', 302 '../base/base.isolate',
300 'chrome.isolate', 303 'chrome.isolate',
301 ], 304 ],
302 } 305 }
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