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

Unified Diff: build/common.gypi

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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
« no previous file with comments | « no previous file | chrome/browser/browsing_data/browsing_data_remover.h » ('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 7388b7e458ac3c498f5af8061a1bc884da2c6ad5..c7ee94a78278588d33a65bcb74e7e29ada84e77e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -376,6 +376,11 @@
# Enable plug-in installation by default.
'enable_plugin_installation%': 1,
+ # Enable PPAPI and NPAPI by default.
+ # TODO(nileshagrawal): Make this flag enable/disable NPAPI as well
+ # as PPAPI; see crbug.com/162667.
+ 'enable_plugins%': 1,
+
# Enable protector service by default.
'enable_protector_service%': 1,
@@ -527,6 +532,12 @@
}],
['OS=="android" or OS=="ios"', {
+ 'enable_plugins%': 0,
+ }, {
+ 'enable_plugins%': 1,
+ }],
+
+ ['OS=="android" or OS=="ios"', {
'enable_protector_service%': 0,
}, {
'enable_protector_service%': 1,
@@ -669,6 +680,7 @@
'enable_web_intents%': '<(enable_web_intents)',
'enable_web_intents_tag%': '<(enable_web_intents_tag)',
'enable_plugin_installation%': '<(enable_plugin_installation)',
+ 'enable_plugins%': '<(enable_plugins)',
'enable_protector_service%': '<(enable_protector_service)',
'enable_session_service%': '<(enable_session_service)',
'enable_themes%': '<(enable_themes)',
@@ -1861,6 +1873,9 @@
['enable_plugin_installation==1', {
'defines': ['ENABLE_PLUGIN_INSTALLATION=1'],
}],
+ ['enable_plugins==1', {
+ 'defines': ['ENABLE_PLUGINS=1'],
+ }],
['enable_protector_service==1', {
'defines': ['ENABLE_PROTECTOR_SERVICE=1'],
}],
« no previous file with comments | « no previous file | chrome/browser/browsing_data/browsing_data_remover.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698