Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: chrome/chrome_common.gypi

Issue 8689001: Reland 111519: Remove default plug-in on Mac, Gtk and Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 0111b2d379bf0347fa5ed6cb453b518c7888cc86..3f2f4871b69e208ad14211b3df351d1a9e065949 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': [
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698