diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 21:49:41 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 21:49:41 +0000 |
| commit | cb5e507bf311305117bc727d94921e89c2dee7de (patch) | |
| tree | 22f7032c4d0770a3042d5d5cd64e37733aa3af38 /webkit/glue | |
| parent | 0d920aacaa1c7439ad940b282ea84dd3c3dacfd4 (diff) | |
| download | chromium_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 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 1b1f3df..16b7197 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -445,15 +445,14 @@ # own hard dependencies. 'hard_dependency': 1, 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:gtk', ], 'sources!': [ 'plugins/plugin_stubs.cc', ], - }, { # else: OS!="linux" and OS!="freebsd" and OS!="openbsd" \ - # and OS!="solaris"' + }, { # else: toolkit_uses_gtk != 1 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'], ['exclude', r'/gtk_']], }], |