From fc5df5176d18d716f33b4b47d9db557d5ca796b9 Mon Sep 17 00:00:00 2001 From: jrummell Date: Fri, 7 Nov 2014 12:08:13 -0800 Subject: [PATCH] Modify branding for CDM adapters. BUG=426252 Review URL: https://codereview.chromium.org/701223002 Cr-Commit-Position: refs/heads/master@{#303279} --- media/cdm/ppapi/external_clear_key/BRANDING | 3 +++ media/media_cdm.gypi | 3 +++ third_party/widevine/cdm/BRANDING | 3 +++ third_party/widevine/cdm/widevine_cdm.gyp | 2 ++ 4 files changed, 11 insertions(+) create mode 100644 media/cdm/ppapi/external_clear_key/BRANDING create mode 100644 third_party/widevine/cdm/BRANDING diff --git a/media/cdm/ppapi/external_clear_key/BRANDING b/media/cdm/ppapi/external_clear_key/BRANDING new file mode 100644 index 00000000000000..c253da9a405510 --- /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 e5a64c8d1c2a7a..0c2510bfd3d72a 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 00000000000000..de8979408a2638 --- /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 2ab6d35b972c3f..2ace05fef402f7 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',