diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 23:45:39 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 23:45:39 +0000 |
| commit | 9b9cd1bef03f57d508d4b9d3bb4b5b1037b0eb8f (patch) | |
| tree | 8d76c1b5c62b65396e910b4f757c2c1373e3c718 /o3d/DEPS | |
| parent | af0164c128ef614a882bed2d1ded27134c9cda54 (diff) | |
| download | chromium_src-9b9cd1bef03f57d508d4b9d3bb4b5b1037b0eb8f.zip chromium_src-9b9cd1bef03f57d508d4b9d3bb4b5b1037b0eb8f.tar.gz chromium_src-9b9cd1bef03f57d508d4b9d3bb4b5b1037b0eb8f.tar.bz2 | |
Bump chromium DEPS to pick up my skia Linux crash fix.
TEST=built and ran on Linux and loaded a font that was not installed
BUG=none
Review URL: http://codereview.chromium.org/565013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/DEPS')
| -rw-r--r-- | o3d/DEPS | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -1,7 +1,9 @@ vars = { "chromium_trunk": "http://src.chromium.org/svn/trunk", "nixysa_rev": "64", - "chromium_rev": "36817", + # When updating the chromium rev, you must also update the nss and sqlite + # revs to match the version pulled-in by Chromium's own DEPS in the new rev. + "chromium_rev": "37758", "o3d_code_rev": "166", "skia_rev": "474", "gyp_rev": "775", @@ -146,6 +148,14 @@ deps_os = { "third_party/python_24": Var("chromium_trunk") + "/deps/third_party/python_24@19441", + + # Dependency of chrome base + "third_party/nss": + Var("chromium_trunk") + "/deps/third_party/nss@36871", + + # Dependency of nss, even though its DEPS fail to mention that. + "third_party/sqlite": + Var("chromium_trunk") + "/src/third_party/sqlite@31834", }, "unix": { # Linux, really. |