diff options
| author | jrummell <jrummell@chromium.org> | 2014-11-03 13:32:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-03 21:34:30 +0000 |
| commit | 5c5f7eb9c1d6500f0bac3e2e4e3fa1ee32d94576 (patch) | |
| tree | a98439d75a24b04cf5a3d43328b7c240e6535db8 /media | |
| parent | 7c80e234132e8bbc67243542202b4b8a09e5da57 (diff) | |
| download | chromium_src-5c5f7eb9c1d6500f0bac3e2e4e3fa1ee32d94576.zip chromium_src-5c5f7eb9c1d6500f0bac3e2e4e3fa1ee32d94576.tar.gz chromium_src-5c5f7eb9c1d6500f0bac3e2e4e3fa1ee32d94576.tar.bz2 | |
Include version number with ClearKey and Widevine cdmadapters
BUG=426252
TEST=compiles, verified version number shows up on Windows
Review URL: https://codereview.chromium.org/681983004
Cr-Commit-Position: refs/heads/master@{#302485}
Diffstat (limited to 'media')
| -rw-r--r-- | media/clearkeycdmadapter.ver | 2 | ||||
| -rw-r--r-- | media/media_cdm.gypi | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/media/clearkeycdmadapter.ver b/media/clearkeycdmadapter.ver new file mode 100644 index 0000000..800abea6 --- /dev/null +++ b/media/clearkeycdmadapter.ver @@ -0,0 +1,2 @@ +INTERNAL_NAME=clearkeycdmadapter_dll +ORIGINAL_FILENAME=clearkeycdmadapter.dll diff --git a/media/media_cdm.gypi b/media/media_cdm.gypi index 6f84ed5..e5a64c8 100644 --- a/media/media_cdm.gypi +++ b/media/media_cdm.gypi @@ -20,7 +20,10 @@ }, 'conditions': [ ['enable_pepper_cdms==1', { - 'targets': [ + 'includes': [ + '../build/util/version.gypi', + ], + 'targets': [ { 'target_name': 'clearkeycdm', 'type': 'none', @@ -94,6 +97,31 @@ 'msvs_disabled_warnings': [ 4267, ], }, { + 'target_name': 'clearkeycdmadapter_resources', + 'type': 'none', + 'conditions': [ + ['branding == "Chrome"', { + 'variables': { + 'branding_path': '../chrome/app/theme/google_chrome/BRANDING', + }, + }, { # else branding!="Chrome" + 'variables': { + 'branding_path': '../chrome/app/theme/chromium/BRANDING', + }, + }], + ], + 'variables': { + 'output_dir': '.', + 'template_input_path': '../chrome/app/chrome_version.rc.version', + }, + 'sources': [ + 'clearkeycdmadapter.ver', + ], + 'includes': [ + '../chrome/version_resource_rules.gypi', + ], + }, + { 'target_name': 'clearkeycdmadapter', 'type': 'none', # Check whether the plugin's origin URL is valid. @@ -102,6 +130,10 @@ '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', 'media_cdm_adapter.gyp:cdmadapter', 'clearkeycdm', + 'clearkeycdmadapter_resources', + ], + 'sources': [ + '<(SHARED_INTERMEDIATE_DIR)/clearkeycdmadapter_version.rc', ], 'conditions': [ ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', { |