summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_common.gypi
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-25 13:15:43 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-25 13:15:43 +0000
commitef777a4cc0aa03ba9e1d738f7f8ac27e4d045eb3 (patch)
tree00d1b93b053b8b8a02d2247de1fb26e7911be1e6 /chrome/chrome_common.gypi
parentf5478b310ce3590b5555321cef0574f50d81bb1d (diff)
downloadchromium_src-ef777a4cc0aa03ba9e1d738f7f8ac27e4d045eb3.zip
chromium_src-ef777a4cc0aa03ba9e1d738f7f8ac27e4d045eb3.tar.gz
chromium_src-ef777a4cc0aa03ba9e1d738f7f8ac27e4d045eb3.tar.bz2
Reland 111519: Remove default plug-in on Mac, Gtk and Aura.
Aura doesn't do plug-ins, and Mac and Gtk already use in-renderer placeholders. TBR=jam@chromium.org BUG=62079 TEST=none Review URL: http://codereview.chromium.org/8689001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
-rw-r--r--chrome/chrome_common.gypi13
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 0111b2d..3f2f4871 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -32,7 +32,6 @@
'common_constants',
'common_net',
'common_version',
- 'default_plugin/default_plugin.gyp:default_plugin',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:base_static',
@@ -247,7 +246,12 @@
['OS=="win"', {
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
- ],
+ ]
+ }],
+ ['OS=="win" and use_aura==0', {
+ 'dependencies': [
+ 'default_plugin/default_plugin.gyp:default_plugin',
+ ]
}],
['toolkit_uses_gtk == 1', {
'dependencies': [
@@ -264,11 +268,6 @@
'-lXext',
],
},
- },],
- ['use_aura==1', {
- 'dependencies!': [
- 'default_plugin/default_plugin.gyp:default_plugin',
- ],
}],
['OS=="linux" and selinux==1', {
'dependencies': [