diff options
| -rw-r--r-- | build/common.gypi | 13 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 6 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 5 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 5 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 2 |
5 files changed, 14 insertions, 17 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', { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index c63749d..59db3d397c 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -42,7 +42,6 @@ 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], # TODO: remove this helper when we have loops in GYP 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], - 'enable_plugin_installation': 1, 'conditions': [ ['OS=="win"', { 'nacl_defines': [ @@ -97,11 +96,6 @@ }], # branding ], # conditions }], # OS=="mac" - ['use_aura==1 or chromeos==1', { - 'variables': { - 'enable_plugin_installation': 0, - } - }], # TODO(mcgrathr): This duplicates native_client/build/common.gypi; # we should figure out a way to unify the settings. ['target_arch=="ia32"', { diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 32928fb..53f72f0 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4234,11 +4234,6 @@ ['include', '^browser/safe_browsing/safe_browsing_tab_observer.h'], ], }], - ['enable_plugin_installation', { - 'defines': [ - 'ENABLE_PLUGIN_INSTALLATION', - ], - }], ['chromeos==0', { 'sources/': [ ['exclude', '^browser/chromeos'], diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index d00b630..a4bfcfa 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -303,11 +303,6 @@ '../remoting/remoting.gyp:remoting_client_plugin', ], }], - ['enable_plugin_installation', { - 'defines': [ - 'ENABLE_PLUGIN_INSTALLATION', - ], - }], ], 'export_dependent_settings': [ '../base/base.gyp:base', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index f02420b..751fd0e 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2390,7 +2390,7 @@ 'test/data/resource.rc', ], }], - ['enable_plugin_installation', { + ['enable_plugin_installation==0', { 'sources!': [ 'browser/plugin_finder_unittest.cc', ], |