diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 17:27:28 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 17:27:28 +0000 |
| commit | 43b7eaca6e8b1c46fc0f9d29be7c38014874defc (patch) | |
| tree | d532110d25e970e067ecb66d2f33d195f45eaf16 /chrome/chrome.gyp | |
| parent | 4f4b2ac3eee9515b079b524606de07bd04a346c7 (diff) | |
| download | chromium_src-43b7eaca6e8b1c46fc0f9d29be7c38014874defc.zip chromium_src-43b7eaca6e8b1c46fc0f9d29be7c38014874defc.tar.gz chromium_src-43b7eaca6e8b1c46fc0f9d29be7c38014874defc.tar.bz2 | |
Remove plugin installation code on ChromeOS and Aura.
BUG=62079
TEST=compiles
Review URL: http://codereview.chromium.org/9113011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117443 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 59db3d397c..c63749d 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -42,6 +42,7 @@ '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': [ @@ -96,6 +97,11 @@ }], # 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"', { |