diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 22:06:54 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 22:06:54 +0000 |
| commit | 6a654d45598c2631f0009101a553fd14b866b62f (patch) | |
| tree | afd71c88f45b680bf30040047075fe259d5c767c /printing | |
| parent | fcc2d5f0e4ff841a6af7cc7f5834985f833cf935 (diff) | |
| download | chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.zip chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.tar.gz chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.tar.bz2 | |
Final gyp patch to make use of the new cross-platform POSIX defines toolkit_uses_gtk, os_posix, and use_x11. For lists of source files that use a mix of POSIX and Gtk APIs, toolkit_uses_gtk was given precedence. Solaris was made to use ALSA also, as libasound has been ported to FreeBSD and Solaris as a wrapper around the native OSS.
Review URL: http://codereview.chromium.org/7055003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/printing.gyp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/printing/printing.gyp b/printing/printing.gyp index aae1a6e..f7ce898 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -89,7 +89,7 @@ ], }, 'conditions': [ - ['OS!="linux" and OS!="freebsd" and OS!="openbsd"',{ + ['toolkit_uses_gtk == 0',{ 'sources/': [['exclude', '_cairo\\.cc$']] }], ['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}], @@ -97,7 +97,7 @@ }, { # else: OS=="win" 'sources/': [['exclude', '_posix\\.cc$']] }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'sources': [ 'metafile_skia_wrapper.cc', 'metafile_skia_wrapper.h', @@ -172,21 +172,19 @@ 'units_unittest.cc', ], 'conditions': [ - ['OS!="linux"', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}], + ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}], ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}], ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']] }, { # else: OS=="win" 'sources/': [['exclude', '_cairo_unittest\\.cc$']] } ], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], 'conditions': [ - ['linux_use_tcmalloc==1', { + ['linux_use_tcmalloc == 1', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], |