Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 8c8bfc1003d5beff85fad49631f5c40de3e41269..87ff8cd7afab43d364227563227c2e2e29d5073d 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1980,6 +1980,21 @@ |
'enable_browser_cdms%': 0, |
}], |
+ # Widevine CDM is enabled by default for Chrome builds, and is a platform |
+ # feature on Android. |
+ ['branding=="Chrome" or OS="android"', { |
+ 'enable_widevine': 1, |
+ }, { |
+ 'enable_widevine': 0, |
lcwu1
2014/12/02 23:23:16
Drive-by comment: Could you add '%' to the gyp var
sandersd (OOO until July 31)
2014/12/12 01:34:46
Done.
|
+ }], |
+ |
+ # Widevine is distributed as a component for Mac and Win. |
ddorwin
2014/12/02 23:31:56
This is only for Chrome. I guess we should make th
|
+ ['OS=="mac" or OS=="win"', { |
+ 'widevine_cdm_is_component': 1, |
+ }, { |
+ 'widevine_cdm_is_component': 0, |
+ }], |
+ |
# Native Client glibc toolchain is enabled |
# by default except on arm, mips and mips64. |
['target_arch=="arm" or target_arch=="mipsel" or target_arch=="mips64el"', { |
@@ -2656,6 +2671,12 @@ |
['enable_browser_cdms==1', { |
'defines': ['ENABLE_BROWSER_CDMS'], |
}], |
+ ['enable_widevine==1', { |
DaleCurtis
2014/12/02 22:58:38
These are global defines which should always be re
sandersd (OOO until July 31)
2014/12/02 23:04:44
I don't know. There is no common include that I am
DaleCurtis
2014/12/02 23:12:17
Ah, that's unfortunate. Do all of these users depe
lcwu1
2014/12/02 23:23:16
Chromecast uses the define. We do depend on media/
ddorwin
2014/12/02 23:31:56
Looking at the paths in this CL, there are some th
DaleCurtis
2014/12/03 01:11:00
Which targets don't depend on media? third_party/w
ddorwin
2014/12/03 01:29:45
As an example, from a brief look, it was not clear
DaleCurtis
2014/12/04 02:45:08
I see, I misread the paths, yeah I don't think a d
|
+ 'defines': ['ENABLE_WIDEVINE'], |
+ }], |
+ ['widevine_cdm_is_component==1', { |
+ 'defines': ['WIDEVINE_CDM_IS_COMPONENT'], |
+ }], |
['configuration_policy==1', { |
'defines': ['ENABLE_CONFIGURATION_POLICY'], |
}], |