Skip to content

Commit

Permalink
Copy Widevine files for swarming tests
Browse files Browse the repository at this point in the history
BUG=474674

Review URL: https://codereview.chromium.org/1063453004

Cr-Commit-Position: refs/heads/master@{#324170}
  • Loading branch information
jrummell-chromium authored and Commit bot committed Apr 8, 2015
1 parent 232bdea commit f584802
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build/android/pylib/utils/isolator.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ def DefaultConfigVariables():
'CONFIGURATION_NAME': constants.GetBuildType(),
'OS': 'android',
'asan': '0',
'branding': 'Chromium',
'chromeos': '0',
'component': 'static_library',
'enable_pepper_cdms': '0',
'enable_plugins': '0',
'fastbuild': '0',
'icu_use_data_file_flag': '1',
Expand Down
2 changes: 2 additions & 0 deletions build/isolate.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,11 @@
'--config-variable', 'CONFIGURATION_NAME=<(CONFIGURATION_NAME)',
'--config-variable', 'OS=<(OS)',
'--config-variable', 'asan=<(asan)',
'--config-variable', 'branding=<(branding)',
'--config-variable', 'chromeos=<(chromeos)',
'--config-variable', 'component=<(component)',
'--config-variable', 'disable_nacl=<(disable_nacl)',
'--config-variable', 'enable_pepper_cdms=<(enable_pepper_cdms)',
'--config-variable', 'enable_plugins=<(enable_plugins)',
'--config-variable', 'fastbuild=<(fastbuild)',
'--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
Expand Down
24 changes: 24 additions & 0 deletions chrome/browser_tests.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@
],
},
}],
['OS=="linux" and branding=="Chrome" and enable_pepper_cdms==1', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libwidevinecdm.so',
'<(PRODUCT_DIR)/libwidevinecdmadapter.so',
],
},
}],
['OS=="linux" and libpeer_target_type=="loadable_module"', {
'variables': {
'files': [
Expand Down Expand Up @@ -182,6 +190,14 @@
],
},
}],
['OS=="mac" and branding=="Chrome" and enable_pepper_cdms==1', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libwidevinecdm.dylib',
'<(PRODUCT_DIR)/widevinecdmadapter.plugin/',
],
},
}],
['OS=="win"', {
'variables': {
'files': [
Expand All @@ -195,6 +211,14 @@
],
},
}],
['OS=="win" and branding=="Chrome" and enable_pepper_cdms==1', {
'variables': {
'files': [
'<(PRODUCT_DIR)/widevinecdm.dll',
'<(PRODUCT_DIR)/widevinecdmadapter.dll',
],
},
}],
['OS=="win" and target_arch=="ia32"', {
'variables': {
'files': [
Expand Down

0 comments on commit f584802

Please sign in to comment.