summaryrefslogtreecommitdiffstats
path: root/chrome/default_plugin
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 21:49:41 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 21:49:41 +0000
commitcb5e507bf311305117bc727d94921e89c2dee7de (patch)
tree22f7032c4d0770a3042d5d5cd64e37733aa3af38 /chrome/default_plugin
parent0d920aacaa1c7439ad940b282ea84dd3c3dacfd4 (diff)
downloadchromium_src-cb5e507bf311305117bc727d94921e89c2dee7de.zip
chromium_src-cb5e507bf311305117bc727d94921e89c2dee7de.tar.gz
chromium_src-cb5e507bf311305117bc727d94921e89c2dee7de.tar.bz2
Make use of the new cross-platform POSIX defines toolkit_uses_gtk, os_posix, and use_x11 for the gyp files. For lists of source files that use a mix of POSIX and Gtk APIs, toolkit_uses_gtk was given precedence. I also added Solaris to the remaining grit files.
Patch by ruben (chromium@hybridsource.org). Review URL: http://codereview.chromium.org/7011032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/default_plugin')
-rw-r--r--chrome/default_plugin/default_plugin.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/default_plugin/default_plugin.gyp b/chrome/default_plugin/default_plugin.gyp
index 247960f..0a53ac1 100644
--- a/chrome/default_plugin/default_plugin.gyp
+++ b/chrome/default_plugin/default_plugin.gyp
@@ -51,7 +51,7 @@
'plugin_install_job_monitor.h',
],
}],
- ['OS=="linux"', {
+ ['toolkit_uses_gtk == 1', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],