diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 16:47:34 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 16:47:34 +0000 |
| commit | 18e0f39b22f4c19185dcfea314177dff372c44be (patch) | |
| tree | 1bd2a1569451c2dcd0ca2b324b0c8994945de516 /build | |
| parent | 0a8f3a7f5e2d8e0c479f142e9f73c9c086e7b317 (diff) | |
| download | chromium_src-18e0f39b22f4c19185dcfea314177dff372c44be.zip chromium_src-18e0f39b22f4c19185dcfea314177dff372c44be.tar.gz chromium_src-18e0f39b22f4c19185dcfea314177dff372c44be.tar.bz2 | |
Add -DENABLE_PLUGIN_INSTALLATION in chrome/renderer.
BUG=62079
TEST=none
Review URL: http://codereview.chromium.org/9211007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 755d526..d8269ed 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -270,6 +270,9 @@ # for details. 'chromium_win_pch%': 0, + # Enable plug-in installation by default. + 'enable_plugin_installation%': 1, + 'conditions': [ # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of # the 'conditions' clause. Initial attempts resulted in chromium and @@ -382,6 +385,12 @@ ['OS=="win" and MSVS_VERSION=="2010"', { 'chromium_win_pch%': 1 }], + + ['use_aura==1 or chromeos==1', { + 'enable_plugin_installation%': 0, + }, { + 'enable_plugin_installation%': 1, + }], ], }, @@ -441,6 +450,7 @@ 'asan%': '<(asan)', 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 'enable_web_intents%': '<(enable_web_intents)', + 'enable_plugin_installation%': '<(enable_plugin_installation)', # Whether to build for Wayland display server 'use_wayland%': 0, @@ -1256,6 +1266,9 @@ ['enable_dart==1', { 'defines': ['WEBKIT_USING_DART=1'], }], + ['enable_plugin_installation==1', { + 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'], + }], ], # conditions for 'target_defaults' 'target_conditions': [ ['enable_wexit_time_destructors==1', { |