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 /crypto | |
| 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 'crypto')
| -rw-r--r-- | crypto/crypto.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 88863a1..e662e52 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -18,7 +18,7 @@ 4018, ], 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + [ 'os_posix == 1 and OS != "mac"', { 'conditions': [ [ 'chromeos==1', { 'sources/': [ ['include', '_chromeos\\.cc$'] ] @@ -38,7 +38,7 @@ } ], ], - }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris" + }, { # os_posix != 1 or OS == "mac" 'sources/': [ ['exclude', '_nss\.cc$'], ], @@ -192,7 +192,7 @@ '../testing/gtest.gyp:gtest', ], 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + [ 'os_posix == 1 and OS != "mac"', { 'conditions': [ [ 'linux_use_tcmalloc==1', { 'dependencies': [ @@ -204,7 +204,7 @@ 'dependencies': [ '../build/linux/system.gyp:nss', ], - }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris" + }, { # os_posix != 1 or OS == "mac" 'sources!': [ 'rsa_private_key_nss_unittest.cc', ] |