Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Unified Diff: net/net.gyp

Issue 6800009: Attn: Mike Belshe Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/net.gyp
===================================================================
--- net/net.gyp (revision 80449)
+++ net/net.gyp (working copy)
@@ -644,6 +644,13 @@
'socket/ssl_server_socket_openssl.cc',
'socket/ssl_host_info.cc',
'socket/ssl_host_info.h',
+ 'socket/sctp_support.cc',
+ 'socket/sctp_support.h',
+ 'socket/sctp_client_socket.h',
+ 'socket/sctp_client_socket_libevent.cc',
+ 'socket/sctp_client_socket_libevent.h',
+ 'socket/sctp_client_socket_pool.cc',
+ 'socket/sctp_client_socket_pool.h',
'socket/tcp_client_socket.cc',
'socket/tcp_client_socket.h',
'socket/tcp_client_socket_libevent.cc',
@@ -804,6 +811,12 @@
'../build/linux/system.gyp:gconf',
'../build/linux/system.gyp:gdk',
],
+ 'link_settings': {
+ 'libraries': [
+ # TODO(jtl): this should not be used on FreeBSD.
+ '-lsctp',
+ ],
+ },
'conditions': [
['use_openssl==1', {
'dependencies': [
@@ -828,6 +841,7 @@
'sources!': [
'http/http_auth_handler_ntlm_portable.cc',
'socket/tcp_client_socket_libevent.cc',
+ 'socket/sctp_client_socket_libevent.cc',
'udp/udp_socket_libevent.cc',
],
'dependencies': [
@@ -990,6 +1004,8 @@
'proxy/sync_host_resolver_bridge_unittest.cc',
'socket/client_socket_pool_base_unittest.cc',
'socket/deterministic_socket_data_unittest.cc',
+ 'socket/sctp_client_socket_pool_unittest.cc',
+ 'socket/sctp_client_socket_unittest.cc',
'socket/socks5_client_socket_unittest.cc',
'socket/socks_client_socket_pool_unittest.cc',
'socket/socks_client_socket_unittest.cc',
@@ -1338,6 +1354,12 @@
'net.gyp:net',
'../third_party/openssl/openssl.gyp:openssl',
],
+ 'link_settings': {
+ 'ldflags': [
+ # TODO(jtl): this should not be used on FreeBSD.
+ '-lsctp',
+ ]
+ },
'sources': [
'tools/dump_cache/url_to_filename_encoder.cc',
'tools/dump_cache/url_to_filename_encoder.h',

Powered by Google App Engine
This is Rietveld 408576698