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

Unified Diff: build/common.gypi

Issue 15028015: Conditionally build support for Pepper-based CDMs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Conditionally compile External Clear Key tests Created 7 years, 7 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: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index e48b6fa338c44f7f6b222728f6795a02712c740c..71276c798fb3d122e8d2d91f70d5729fc3c23e2b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1422,6 +1422,12 @@
'use_cups%': 0,
}],
+ ['enable_plugins==1 and (OS=="linux" or OS=="mac" or OS=="win" or google_tv==1)', {
+ 'enable_pepper_cdms%': 1,
+ }, {
+ 'enable_pepper_cdms%': 0,
+ }],
+
# Native Client glibc toolchain is enabled
# by default except on arm and mips.
['target_arch=="arm" or target_arch=="mipsel"', {
@@ -1938,6 +1944,9 @@
['enable_viewport==1', {
'defines': ['ENABLE_VIEWPORT'],
}],
+ ['enable_pepper_cdms==1', {
+ 'defines': ['ENABLE_PEPPER_CDMS'],
+ }],
['configuration_policy==1', {
'defines': ['ENABLE_CONFIGURATION_POLICY'],
}],

Powered by Google App Engine
This is Rietveld 408576698