Skip to content

Commit

Permalink
Revert of Copy Widevine files for swarming tests (patchset chromium#5
Browse files Browse the repository at this point in the history
…id:80001 of https://codereview.chromium.org/1063453004/)

Reason for revert:
[Sheriff] Breaks chrome mac compilation:
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac/builds/355

Original issue's description:
> Copy Widevine files for swarming tests
>
> BUG=474674
>
> Committed: https://crrev.com/f584802a283f812bdeb9d3704c021a266486ab00
> Cr-Commit-Position: refs/heads/master@{#324170}

TBR=thakis@chromium.org,xhwang@chromium.org,maruel@chromium.org,jrummell@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=474674

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

Cr-Commit-Position: refs/heads/master@{#324195}
  • Loading branch information
mi-ac authored and Commit bot committed Apr 8, 2015
1 parent 168a206 commit 4232e29
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 28 deletions.
2 changes: 0 additions & 2 deletions build/android/pylib/utils/isolator.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ 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: 0 additions & 2 deletions build/isolate.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,9 @@
'--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: 0 additions & 24 deletions chrome/browser_tests.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@
],
},
}],
['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 @@ -190,14 +182,6 @@
],
},
}],
['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 @@ -211,14 +195,6 @@
],
},
}],
['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 4232e29

Please sign in to comment.