chromium/src
0
Fork 0
Code Activity

net: Build net.dll on Windows.

Browse Source 
BUG=76997
TEST=none
Review URL: http://codereview.chromium.org/7281018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91360 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
rvargas@google.com
2011-07-01 20:51:20 +00:00
parent 66a730f1af
commit 27430766fc
4 changed files with 25 additions and 4 deletions

1
jingle/jingle.gyp

@ -103,6 +103,7 @@
],
'dependencies': [
'../base/base.gyp:base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../net/net.gyp:net',
'../third_party/expat/expat.gyp:expat',
'../third_party/libjingle/libjingle.gyp:libjingle',

24
net/net.gyp

@ -9,7 +9,6 @@
'targets': [
{
'target_name': 'net',
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
@ -790,6 +789,7 @@
},
],
[ 'OS == "win"', {
'type': '<(component)',
'sources!': [
'http/http_auth_handler_ntlm_portable.cc',
'socket/tcp_client_socket_libevent.cc',
@ -805,8 +805,8 @@
'third_party/nss/ssl.gyp:ssl',
'tld_cleanup',
],
},
{ # else: OS != "win"
}, { # else: OS != "win"
'type': 'static_library',
'sources!': [
'base/winsock_init.cc',
'base/winsock_init.h',
@ -817,6 +817,24 @@
],
},
],
[ 'OS == "win" and component == "shared_library"', {
'defines': [
'NET_DLL',
'NET_IMPLEMENTATION',
],
'msvs_disabled_warnings': [
# class 'std::xx' needs to have dll-interface.
4251,
],
'direct_dependent_settings': {
'defines': [
'NET_DLL',
],
'msvs_disabled_warnings': [
4251,
],
},
}],
[ 'OS == "mac"', {
'dependencies': [
'../third_party/nss/nss.gyp:nspr',

2
net/socket/client_socket_pool_base.h

@ -51,7 +51,7 @@ namespace net {
class ClientSocketHandle;
// Returns the client socket reuse policy.
int GetSocketReusePolicy();
NET_TEST int GetSocketReusePolicy();
// Sets the client socket reuse policy.
// NOTE: 'policy' should be a valid ClientSocketReusePolicy enum value.

2
remoting/remoting.gyp

@ -232,6 +232,7 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../ui/ui.gyp:ui_gfx',
'../net/net.gyp:net',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
@ -246,6 +247,7 @@
],
'export_dependent_settings': [
'../base/base.gyp:base',
'../net/net.gyp:net',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'proto/chromotocol.gyp:chromotocol_proto_lib',
],