diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 22:32:14 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 22:32:14 +0000 |
| commit | 19c639102a3748cc8cfcffec595c5b7ac1078f55 (patch) | |
| tree | 78641f98c8468c723919df7dced4d7d47e967feb | |
| parent | 219bf8070caa97ff4a1e08747c7caf53dc9122c6 (diff) | |
| download | chromium_src-19c639102a3748cc8cfcffec595c5b7ac1078f55.zip chromium_src-19c639102a3748cc8cfcffec595c5b7ac1078f55.tar.gz chromium_src-19c639102a3748cc8cfcffec595c5b7ac1078f55.tar.bz2 | |
Use crnss.dll and crnspr.dll with the component build.
BUG=85776
TEST=none
Review URL: http://codereview.chromium.org/7273015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90853 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | crypto/crypto.gyp | 1 | ||||
| -rw-r--r-- | net/net.gyp | 2 | ||||
| -rw-r--r-- | net/third_party/nss/ssl.gyp | 1 |
4 files changed, 6 insertions, 2 deletions
@@ -267,7 +267,7 @@ deps_os = { # NSS, for SSLClientSocketNSS. "src/third_party/nss": - "/trunk/deps/third_party/nss@83672", + "/trunk/deps/third_party/nss@90649", "src/third_party/swig/win": "/trunk/deps/third_party/swig/win@" + Var("swig_revision"), @@ -302,7 +302,7 @@ deps_os = { # NSS, for SSLClientSocketNSS. "src/third_party/nss": - "/trunk/deps/third_party/nss@83672", + "/trunk/deps/third_party/nss@90649", "src/chrome/installer/mac/third_party/xz/xz": "/trunk/deps/third_party/xz@87706", diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index b6e1f65..859fb44 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -61,6 +61,7 @@ }], [ 'OS == "mac" or OS == "win"', { 'dependencies': [ + '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', ], },], diff --git a/net/net.gyp b/net/net.gyp index f5e9e0d..9134b72 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -798,6 +798,7 @@ 'udp/udp_socket_libevent.h', ], 'dependencies': [ + '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', 'third_party/nss/ssl.gyp:ssl', 'tld_cleanup', @@ -816,6 +817,7 @@ ], [ 'OS == "mac"', { 'dependencies': [ + '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', 'third_party/nss/ssl.gyp:ssl', ], diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp index 81ad724..d7e3f20 100644 --- a/net/third_party/nss/ssl.gyp +++ b/net/third_party/nss/ssl.gyp @@ -134,6 +134,7 @@ ], 'dependencies': [ '../../../third_party/zlib/zlib.gyp:zlib', + '../../../third_party/nss/nss.gyp:nspr', '../../../third_party/nss/nss.gyp:nss', ], 'direct_dependent_settings': { |