diff options
| author | jrummell <jrummell@chromium.org> | 2014-11-07 12:08:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 20:08:28 +0000 |
| commit | fc5df5176d18d716f33b4b47d9db557d5ca796b9 (patch) | |
| tree | 8f19b300a773bd9fb0de010107345babb5fd18b7 | |
| parent | a896e504cd759295ec186d35f358f68de9d3e02c (diff) | |
| download | chromium_src-fc5df5176d18d716f33b4b47d9db557d5ca796b9.zip chromium_src-fc5df5176d18d716f33b4b47d9db557d5ca796b9.tar.gz chromium_src-fc5df5176d18d716f33b4b47d9db557d5ca796b9.tar.bz2 | |
Modify branding for CDM adapters.
BUG=426252
Review URL: https://codereview.chromium.org/701223002
Cr-Commit-Position: refs/heads/master@{#303279}
| -rw-r--r-- | media/cdm/ppapi/external_clear_key/BRANDING | 3 | ||||
| -rw-r--r-- | media/media_cdm.gypi | 3 | ||||
| -rw-r--r-- | third_party/widevine/cdm/BRANDING | 3 | ||||
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm.gyp | 2 |
4 files changed, 11 insertions, 0 deletions
diff --git a/media/cdm/ppapi/external_clear_key/BRANDING b/media/cdm/ppapi/external_clear_key/BRANDING new file mode 100644 index 0000000..c253da9 --- /dev/null +++ b/media/cdm/ppapi/external_clear_key/BRANDING @@ -0,0 +1,3 @@ +PRODUCT_FULLNAME=External Clear Key Content Decryption Module Adapter +PRODUCT_SHORTNAME=External Clear Key +PRODUCT_DESCRIPTION=External Clear Key Content Decryption Module Adapter. Used for testing EME. diff --git a/media/media_cdm.gypi b/media/media_cdm.gypi index e5a64c8..0c2510b 100644 --- a/media/media_cdm.gypi +++ b/media/media_cdm.gypi @@ -113,6 +113,9 @@ 'variables': { 'output_dir': '.', 'template_input_path': '../chrome/app/chrome_version.rc.version', + 'extra_variable_files_arguments': + [ '-f', 'cdm/ppapi/external_clear_key/BRANDING' ], + 'extra_variable_files': [ 'cdm/ppapi/external_clear_key/BRANDING' ], }, 'sources': [ 'clearkeycdmadapter.ver', diff --git a/third_party/widevine/cdm/BRANDING b/third_party/widevine/cdm/BRANDING new file mode 100644 index 0000000..de89794 --- /dev/null +++ b/third_party/widevine/cdm/BRANDING @@ -0,0 +1,3 @@ +PRODUCT_FULLNAME=Widevine Content Decryption Module Adapter +PRODUCT_SHORTNAME=Widevine CDM Adapter +PRODUCT_DESCRIPTION=Widevine Content Decryption Module Adapter enables the Widevine CDM to be used by Chrome. diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp index 2ab6d35..2ace05f 100644 --- a/third_party/widevine/cdm/widevine_cdm.gyp +++ b/third_party/widevine/cdm/widevine_cdm.gyp @@ -70,6 +70,8 @@ 'variables': { 'output_dir': '.', 'template_input_path': '../../../chrome/app/chrome_version.rc.version', + 'extra_variable_files_arguments': [ '-f', 'BRANDING' ], + 'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above }, 'sources': [ 'widevinecdmadapter.ver', |