diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 22:15:09 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 22:15:09 +0000 |
| commit | 33cdc9b854044864f7494c23a21f78733a961236 (patch) | |
| tree | 5cff7b26780bc68451fb3917baea18bdb9f1c95a /net/net.gyp | |
| parent | a7fb410b943d13c9f4aed11fe8d2774f990b3220 (diff) | |
| download | chromium_src-33cdc9b854044864f7494c23a21f78733a961236.zip chromium_src-33cdc9b854044864f7494c23a21f78733a961236.tar.gz chromium_src-33cdc9b854044864f7494c23a21f78733a961236.tar.bz2 | |
Revert 77870 - UDP sockets implementation for windows.
BUG=None
TEST=Unittests
Review URL: http://codereview.chromium.org/6658027
TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/6681014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/net/net.gyp b/net/net.gyp index 7fa024a..12b2a95 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -199,8 +199,6 @@ 'base/upload_data_stream.h', 'base/winsock_init.cc', 'base/winsock_init.h', - 'base/winsock_util.cc', - 'base/winsock_util.h', 'base/x509_certificate.cc', 'base/x509_certificate.h', 'base/x509_certificate_mac.cc', @@ -327,7 +325,6 @@ ], 'sources!': [ 'base/winsock_init.cc', - 'base/winsock_util.cc', ], }, ], @@ -677,18 +674,6 @@ 'spdy/spdy_settings_storage.h', 'spdy/spdy_stream.cc', 'spdy/spdy_stream.h', - 'udp/datagram_client_socket.h', - 'udp/datagram_server_socket.h', - 'udp/datagram_socket.h', - 'udp/udp_client_socket.cc', - 'udp/udp_client_socket.h', - 'udp/udp_server_socket.cc', - 'udp/udp_server_socket.h', - 'udp/udp_socket.h', - 'udp/udp_socket_libevent.cc', - 'udp/udp_socket_libevent.h', - 'udp/udp_socket_win.cc', - 'udp/udp_socket_win.h', 'url_request/https_prober.h', 'url_request/https_prober.cc', 'url_request/url_request.cc', @@ -823,7 +808,6 @@ 'sources!': [ 'http/http_auth_handler_ntlm_portable.cc', 'socket/tcp_client_socket_libevent.cc', - 'udp/udp_socket_libevent.cc', ], 'dependencies': [ '../third_party/nss/nss.gyp:nss', @@ -1009,7 +993,6 @@ 'tools/dump_cache/url_utilities.h', 'tools/dump_cache/url_utilities.cc', 'tools/dump_cache/url_utilities_unittest.cc', - 'udp/udp_socket_unittest.cc', 'url_request/url_request_job_tracker_unittest.cc', 'url_request/url_request_throttler_unittest.cc', 'url_request/url_request_unittest.cc', @@ -1448,6 +1431,29 @@ }, ], }], + ['OS=="linux"', { + 'targets': [ + { + 'target_name': 'udp_socket_unittest', + 'type': 'executable', + 'dependencies': [ + 'net', + 'net_test_support', + '../base/base.gyp:base', + '../base/base.gyp:base_i18n', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + '../third_party/zlib/zlib.gyp:zlib', + ], + 'sources': [ + 'udp/udp_client_socket.cc', + 'udp/udp_server_socket.cc', + 'udp/udp_socket_libevent.cc', + 'udp/udp_socket_unittest.cc', + ] + }, + ], + }], ['OS=="win"', { 'targets': [ { |