diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 20:51:20 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 20:51:20 +0000 |
| commit | 27430766fcf4fc23064f223e88e81e342fd59909 (patch) | |
| tree | 69e3c504e5e5f735e6bffd132cfaca89e8ff84ec | |
| parent | 66a730f1afc63aad6e5927c78632a69341ce26a6 (diff) | |
| download | chromium_src-27430766fcf4fc23064f223e88e81e342fd59909.zip chromium_src-27430766fcf4fc23064f223e88e81e342fd59909.tar.gz chromium_src-27430766fcf4fc23064f223e88e81e342fd59909.tar.bz2 | |
net: Build net.dll on Windows.
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
| -rw-r--r-- | jingle/jingle.gyp | 1 | ||||
| -rw-r--r-- | net/net.gyp | 24 | ||||
| -rw-r--r-- | net/socket/client_socket_pool_base.h | 2 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 2 |
4 files changed, 25 insertions, 4 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp index f87558f..78cf20d 100644 --- a/jingle/jingle.gyp +++ b/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', diff --git a/net/net.gyp b/net/net.gyp index 97386b9..061b547 100644 --- a/net/net.gyp +++ b/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', diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index 2490c02..d4b1dbc 100644 --- a/net/socket/client_socket_pool_base.h +++ b/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. diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index bcdf9ab..1442876 100644 --- a/remoting/remoting.gyp +++ b/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', ], |