Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: third_party/widevine/cdm/widevine_cdm.gyp

Issue 681983004: Include version number with ClearKey and WideVine cdmadapters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/widevine/cdm/widevine_cdm.gyp
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index 48896c153c407838e2525d05dd04cc375a20d671..2ab6d35b972c3f91d31a75309874cf8905e70e97 100644
--- a/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/third_party/widevine/cdm/widevine_cdm.gyp
@@ -46,10 +46,39 @@
}],
],
},
+ 'includes': [
+ '../../../build/util/version.gypi',
+ ],
+
# Always provide a target, so we can put the logic about whether there's
# anything to be done in this file (instead of a higher-level .gyp file).
'targets': [
{
+ 'target_name': 'widevinecdmadapter_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': [
+ 'widevinecdmadapter.ver',
+ ],
+ 'includes': [
+ '../../../chrome/version_resource_rules.gypi',
+ ],
+ },
+ {
# GN version: //third_party/widevine/cdm:adapter
'target_name': 'widevinecdmadapter',
'type': 'none',
@@ -60,6 +89,10 @@
'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',
'widevine_cdm_version_h',
'widevine_cdm_binaries',
+ 'widevinecdmadapter_resources',
+ ],
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/widevinecdmadapter_version.rc',
],
'conditions': [
[ 'os_posix == 1 and OS != "mac"', {

Powered by Google App Engine
This is Rietveld 408576698