diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 04:12:41 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 04:12:41 +0000 |
| commit | e190c9ea6211125a1c836d913d504643678a35c5 (patch) | |
| tree | 196f48ddc2ad2676fff1a38e3b769dfb6c535aee | |
| parent | 75beff8660e7fab27382331b121d9291fb1ca8df (diff) | |
| download | chromium_src-e190c9ea6211125a1c836d913d504643678a35c5.zip chromium_src-e190c9ea6211125a1c836d913d504643678a35c5.tar.gz chromium_src-e190c9ea6211125a1c836d913d504643678a35c5.tar.bz2 | |
Pull rlz on mac too, roll rlz 49:52
50: Wiki update
51: Explicitly make the rlz targets win-only
52: Build fix after 51
BUG=46579
TEST=none
TBR=gwillson
Review URL: http://codereview.chromium.org/9398010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122033 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -51,6 +51,7 @@ vars = { "webrtc_revision": "1538", "jsoncpp_revision": "248", "nss_revision": "117974", + "rlz_revision": "52", } deps = { @@ -366,7 +367,7 @@ deps_os = { Var("nacl_tools_revision")), "src/rlz": - (Var("googlecode_url") % "rlz") + "/trunk@49", + (Var("googlecode_url") % "rlz") + "/trunk@" + Var("rlz_revision"), # Dependencies used by libjpeg-turbo "src/third_party/yasm/binaries": @@ -395,6 +396,9 @@ deps_os = { "src/third_party/swig/mac": "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"), + "src/rlz": + (Var("googlecode_url") % "rlz") + "/trunk@" + Var("rlz_revision"), + # NSS, for SSLClientSocketNSS. "src/third_party/nss": "/trunk/deps/third_party/nss@" + Var("nss_revision"), |