diff options
author | Ben Murdoch <benm@google.com> | 2014-04-03 12:29:45 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2014-04-03 12:29:45 +0100 |
commit | e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d (patch) | |
tree | f266aab56db899073b21c1edd1d0e00055b9a2cf /DEPS | |
parent | 67e8dac6e410a019f58fc452b262a184e8e7fd12 (diff) | |
download | chromium_org-e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d.tar.gz |
Merge from Chromium at DEPS revision 261286
This commit was generated by merge_to_master.py.
Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
Diffstat (limited to 'DEPS')
-rw-r--r-- | DEPS | 33 |
1 files changed, 10 insertions, 23 deletions
@@ -23,7 +23,7 @@ vars = { "libcxxabi_revision": "197063", "webkit_trunk": "http://src.chromium.org/blink/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "170429", + "webkit_revision": "170710", "chromium_git": "https://chromium.googlesource.com", "chromiumos_git": "https://chromium.googlesource.com/chromiumos", "skia_git": "https://skia.googlesource.com", @@ -35,7 +35,7 @@ vars = { "google_toolbox_for_mac_revision": "662", "libaddressinput_revision": "176", "libphonenumber_revision": "621", - "libvpx_revision": "259953", + "libvpx_revision": "260795", "lss_revision": "24", # These two FFmpeg variables must be updated together. One is used for SVN @@ -45,17 +45,17 @@ vars = { "sfntly_revision": "228", "lighttpd_revision": "33737", - "skia_revision": "13989", - "skia_hash": "da0d978b1fa682f82d82f21924f2a786677fcdb5", + "skia_revision": "14021", + "skia_hash": "c282ba85bababb903d8cd43320508790195a98f9", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. "v8_branch": "trunk", - "v8_revision": "20290", + "v8_revision": "20418", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling WebRTC # and V8 without interference from each other. - "webrtc_revision": "5807", + "webrtc_revision": "5831", "jsoncpp_revision": "248", "nss_revision": "259440", # Three lines of non-changing comments so that @@ -74,7 +74,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1289", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1295", "src/sdch/open-vcdiff": (Var("googlecode_url") % "open-vcdiff") + "/trunk@42", @@ -89,7 +89,7 @@ deps = { Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"), "src/third_party/trace-viewer": - (Var("googlecode_url") % "trace-viewer") + "/trunk@1221", + (Var("googlecode_url") % "trace-viewer") + "/trunk@1227", "src/third_party/WebKit": Var("webkit_trunk") + "@" + Var("webkit_revision"), @@ -253,7 +253,7 @@ deps = { "/trunk/jsoncpp/src/lib_json@" + Var("jsoncpp_revision"), "src/third_party/libyuv": - (Var("googlecode_url") % "libyuv") + "/trunk@986", + (Var("googlecode_url") % "libyuv") + "/trunk@994", "src/third_party/smhasher/src": (Var("googlecode_url") % "smhasher") + "/trunk@151", @@ -469,19 +469,6 @@ deps_os = { "src/third_party/gold": "/trunk/deps/third_party/gold@228995", - "src/third_party/libmtp": - "/trunk/deps/third_party/libmtp@206535", - - # Used on Linux only. CrOS already has a copy. - "src/third_party/mtpd/source": - Var("chromiumos_git") + "/platform/mtpd.git" + - "@f9759da3a7cd95080414a7da0d899c47cad794f2", - - # Used on Linux only. CrOS already has a copy. - "src/third_party/cros_dbus_cplusplus/source": - Var("chromiumos_git") + "/third_party/dbus-cplusplus.git" + - "@f78453e0ba9f3d1584e8873aa3c7437cec861ce0", - # For Linux and Chromium OS. "src/third_party/cros_system_api": Var("chromiumos_git") + "/platform/system_api.git" + @@ -517,7 +504,7 @@ deps_os = { "android": { "src/third_party/android_tools": Var("chromium_git") + "/android_tools.git" + - "@ca35676f4f652fa97964c488313720f55efd4405", + "@9086a711deef9b1f85bf9290b7b9598be32458d5", "src/third_party/aosp": "/trunk/deps/third_party/aosp@148330", |