Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 154b94786ca9e3daaf62f6b0188e247e83fbccd1..439a0261ef0cca7cff5957a15f335eeadc82750b 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -258,6 +258,9 @@ |
# faster builds. |
'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 |
@@ -365,6 +368,12 @@ |
}, { |
'ui_compositor_image_transport%': 0, |
}], |
+ |
+ ['use_aura==1 or chromeos==1', { |
+ 'enable_plugin_installation%': 0, |
+ }, { |
+ 'enable_plugin_installation%': 1, |
+ }], |
], |
}, |
@@ -424,6 +433,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, |
@@ -1239,6 +1249,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', { |