diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 16:34:40 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 16:34:40 +0000 |
| commit | 464ad175642fcea685097c554a43e637f6f27401 (patch) | |
| tree | 57f3e0f1463e0f6d098407756480d7616b719989 /DEPS | |
| parent | c7c003e0c179cf21718c1183da630990e5d3c82e (diff) | |
| download | chromium_src-464ad175642fcea685097c554a43e637f6f27401.zip chromium_src-464ad175642fcea685097c554a43e637f6f27401.tar.gz chromium_src-464ad175642fcea685097c554a43e637f6f27401.tar.bz2 | |
Roll nss 115445:117974 on mac as well.
I tried to do this in http://codereview.chromium.org/9178035 but
missed the fact that nss was listed in deps_os for both win and
mac, and I just updated win back then.
nss 115445:117974
Only change:
r117974 Disable harmless warnings for 3rdparty code: nss, nspr.
BUG=102390
TEST=none
TBR=evan
Review URL: https://chromiumcodereview.appspot.com/9365009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -50,6 +50,7 @@ vars = { "v8_revision": "10621", "webrtc_revision": "1538", "jsoncpp_revision": "248", + "nss_revision": "117974", } deps = { @@ -355,7 +356,7 @@ deps_os = { # NSS, for SSLClientSocketNSS. "src/third_party/nss": - "/trunk/deps/third_party/nss@117974", + "/trunk/deps/third_party/nss@" + Var("nss_revision"), "src/third_party/swig/win": "/trunk/deps/third_party/swig/win@" + Var("swig_revision"), @@ -396,7 +397,7 @@ deps_os = { # NSS, for SSLClientSocketNSS. "src/third_party/nss": - "/trunk/deps/third_party/nss@115445", + "/trunk/deps/third_party/nss@" + Var("nss_revision"), "src/chrome/installer/mac/third_party/xz/xz": "/trunk/deps/third_party/xz@87706", |