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 /net | |
| 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 'net')
| -rw-r--r-- | net/net.gyp | 12 | ||||
| -rw-r--r-- | net/third_party/nss/ssl.gyp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/net/net.gyp b/net/net.gyp index 9169f97..1931bea 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -726,7 +726,7 @@ ], }, ], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + [ 'toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gconf', '../build/linux/system.gyp:gdk', @@ -995,7 +995,7 @@ 'proxy/proxy_config_service_linux_unittest.cc', ], }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + [ 'toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', @@ -1007,7 +1007,7 @@ ], } ], - [ 'OS == "linux"', { + [ 'os_posix == 1 and OS != "mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -1171,7 +1171,7 @@ '../third_party/protobuf/protobuf.gyp:py_proto', ], }], - ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['use_openssl==1', { 'dependencies': [ @@ -1184,7 +1184,7 @@ }], ], }], - ['OS == "linux"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -1292,7 +1292,7 @@ }, ], 'conditions': [ - ['OS=="linux"', { + ['os_posix == 1 and OS != "mac"', { 'targets': [ { 'target_name': 'flip_in_mem_edsm_server', diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp index 562539e..eb732a0 100644 --- a/net/third_party/nss/ssl.gyp +++ b/net/third_party/nss/ssl.gyp @@ -4,7 +4,7 @@ { 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + [ 'os_posix == 1 and OS != "mac"', { 'conditions': [ ['sysroot!=""', { 'variables': { @@ -105,7 +105,7 @@ ], }, ], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + [ 'os_posix == 1 and OS != "mac"', { 'defines': [ # These macros are needed only for compiling the files in # ssl/bodge. |