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

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: Use AppendAscii() where possible. 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
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 73923adccef60582f63d06ec8fb71e1132c48715..b63b5503387ddcc6acf5cf2fa723a17c8b3dac7a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1411,6 +1411,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"', {
@@ -1911,6 +1917,9 @@
['enable_viewport==1', {
'defines': ['ENABLE_VIEWPORT'],
}],
+ ['enable_pepper_cdms==1', {
+ 'defines': ['ENABLE_PEPPER_CDMS'],
+ }],
['configuration_policy==1', {
'defines': ['ENABLE_CONFIGURATION_POLICY'],
}],
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698