third_party/widevine/cdm/widevine_cdm.gyp - Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix #endif Created 6 years 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 2ace05fef402f7ca0d346364c5a84571af7fd47b..4cceebcbb8b85fa13dad4d3d98538d71c1418474 100644

--- a/third_party/widevine/cdm/widevine_cdm.gyp

+++ b/third_party/widevine/cdm/widevine_cdm.gyp

@@ -7,8 +7,12 @@

'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',

'widevine_cdm_binary_files%': [],

'conditions': [

- [ 'branding == "Chrome"', {

+ [ 'enable_widevine_cdm == 1', {

'conditions': [

+ [ 'OS == "android"', {

+ 'widevine_cdm_version_h_file%':

+ 'android/widevine_cdm_version.h',

+ }],

[ 'chromeos == 1', {

'widevine_cdm_version_h_file%':

'chromeos/<(target_arch)/widevine_cdm_version.h',

@@ -40,10 +44,6 @@

}],

- [ 'OS == "android"', {

- 'widevine_cdm_version_h_file%':

- 'android/widevine_cdm_version.h',

- }],

'includes': [

« no previous file with comments | « third_party/widevine/cdm/android/widevine_cdm_version.h ('k') | third_party/widevine/cdm/widevine_cdm_common.h » ('j') | no next file with comments »