diff options
| author | jrummell <jrummell@chromium.org> | 2015-04-08 13:48:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-08 20:49:22 +0000 |
| commit | d08e13978878f511b07b8c3aaf61a49054371c84 (patch) | |
| tree | 4f27ee299ff89524533a8f13cf168dc3234f9fa9 | |
| parent | f4bb78ba1e15f8be8a3943bedfe9a5f52c4ef42c (diff) | |
| download | chromium_src-d08e13978878f511b07b8c3aaf61a49054371c84.zip chromium_src-d08e13978878f511b07b8c3aaf61a49054371c84.tar.gz chromium_src-d08e13978878f511b07b8c3aaf61a49054371c84.tar.bz2 | |
Reland "Copy Widevine files for swarming tests"
BUG=474674
Review URL: https://codereview.chromium.org/1072583002
Cr-Commit-Position: refs/heads/master@{#324279}
| -rw-r--r-- | build/android/pylib/utils/isolator.py | 2 | ||||
| -rw-r--r-- | build/isolate.gypi | 2 | ||||
| -rw-r--r-- | chrome/browser_tests.isolate | 24 |
3 files changed, 28 insertions, 0 deletions
diff --git a/build/android/pylib/utils/isolator.py b/build/android/pylib/utils/isolator.py index 8025b0f..8db993d 100644 --- a/build/android/pylib/utils/isolator.py +++ b/build/android/pylib/utils/isolator.py @@ -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', diff --git a/build/isolate.gypi b/build/isolate.gypi index c85585d..a34f265 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -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)', diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 7d97d28..89f8439 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -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': [ @@ -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': [ @@ -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': [ |