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

Unified Diff: chrome/chrome_common.gypi

Issue 8676038: Revert 111519 - Remove default plug-in on Mac, Gtk and Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/default_plugin/default_plugin.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
===================================================================
--- chrome/chrome_common.gypi (revision 111520)
+++ chrome/chrome_common.gypi (working copy)
@@ -32,6 +32,7 @@
'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',
@@ -246,13 +247,8 @@
['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': [
'../build/linux/system.gyp:gtk',
@@ -268,6 +264,11 @@
'-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/default_plugin/default_plugin.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698