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 /jingle | |
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 'jingle')
-rw-r--r-- | jingle/jingle.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index 8db3011..1206b71 100644 --- a/jingle/jingle.gyp +++ b/jingle/jingle.gyp @@ -110,7 +110,7 @@ '../third_party/libjingle/libjingle.gyp:libjingle', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk' ], |