Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 9e90c3a14b7d67421a4d446eb4aa2f4b854af983..a8676b8070f147923b7a1c4dfeab9f159f0b6e75 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -376,6 +376,9 @@ |
| # Enable plug-in installation by default. |
| 'enable_plugin_installation%': 1, |
| + # Enable ppapi by default. |
|
palmer
2012/12/03 23:50:51
Maybe improve the comment:
# Enable PPAPI and NPA
nilesh
2012/12/04 00:21:48
Done.
|
| + 'enable_plugins%': 1, |
| + |
| # Enable protector service by default. |
| 'enable_protector_service%': 1, |
| @@ -525,6 +528,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, |
| @@ -674,6 +683,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)', |
| @@ -1869,6 +1879,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'], |
| }], |