diff options
Diffstat (limited to 'chromium/DEPS')
| -rw-r--r-- | chromium/DEPS | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chromium/DEPS b/chromium/DEPS index 7519139a006..59eed92160d 100644 --- a/chromium/DEPS +++ b/chromium/DEPS @@ -8,12 +8,12 @@ vars = { "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code", "webkit_trunk": "http://src.chromium.org/blink/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "156113", + "webkit_revision": "155942", "chromium_git": "https://chromium.googlesource.com", "chromiumos_git": "https://chromium.googlesource.com/chromiumos", "skia_git": "https://skia.googlesource.com", "swig_revision": "69281", - "nacl_revision": "12000", + "nacl_revision": "11988", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. "nacl_tools_revision": "11437", # native_client/DEPS: tools_rev @@ -29,12 +29,12 @@ vars = { "ffmpeg_hash": "894e6f715645528e815aee2dad45b59704238dcd", "sfntly_revision": "134", - "skia_revision": "10699", - "skia_hash": "a5b2bf898060f0883f73a9a27db8b69bd0180440", + "skia_revision": "10680", + "skia_hash": "8f4825bfb1da69439e1e96a0c6ea04488757d95e", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. - "v8_revision": "16198", + "v8_revision": "16159", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling WebRTC # and V8 without interference from each other. @@ -91,7 +91,7 @@ deps = { "src/third_party/cacheinvalidation/src": (Var("googlecode_url") % "google-cache-invalidation-api") + - "/trunk/src@312", + "/trunk/src@309", "src/third_party/leveldatabase/src": (Var("googlecode_url") % "leveldb") + "/trunk@75", @@ -152,7 +152,7 @@ deps = { # When roll to another webgl conformance tests revision, please goto # chrome/test/gpu and run generate_webgl_conformance_test_list.py. "src/third_party/webgl_conformance": - "/trunk/deps/third_party/webgl/sdk/tests@217526", + "/trunk/deps/third_party/webgl/sdk/tests@217097", "src/third_party/swig/Lib": "/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"), @@ -430,7 +430,7 @@ deps_os = { # For Linux and Chromium OS. "src/third_party/cros_system_api": Var("chromiumos_git") + "/platform/system_api.git" + - "@94831a5a958ea6029aaf0c900b5187726557aacf", + "@9bad33f702cd5cefb0d5603d6853b26428425081", # Note that this is different from Android's freetype repo. "src/third_party/freetype2/src": |