From d3131ed04976777bf846f71e34be3fd53d0a064c Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 21 Dec 2011 16:25:30 +0000 Subject: [PATCH] Roll Chrome to canary (114939) - Keep up to date with the clang rev Chrome is using. - tools/clang/update.sh now updates clang on Linux if it has been manually run once. - We can remove clang_revision from DEPS; now maintained in update.sh. - Also keep the gyp rev in sync. TEST=build on Linux, Mac, Win Review URL: http://webrtc-codereview.appspot.com/331010 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1271 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/DEPS b/DEPS index 2208b02b0..a1f2210f1 100644 --- a/DEPS +++ b/DEPS @@ -3,15 +3,9 @@ vars = { # If you do not know, use the full path while defining your new deps entry. "googlecode_url": "http://%s.googlecode.com/svn", "chromium_trunk" : "http://src.chromium.org/svn/trunk", - "chromium_revision": "106036", + "chromium_revision": "114939", "libjingle_revision": "100", - # Note: On most bots, clang is not checked out via DEPS but by - # tools/clang/scripts/update.sh. The script reads this line here. - # Do NOT CHANGE this if you don't know what you're doing -- see - # http://code.google.com/p/chromium/wiki/UpdatingClang - "clang_revision": "142072", - # External resources like video and audio files used for testing purposes. # Downloaded on demand when needed. "webrtc_resources_revision": "4", @@ -32,7 +26,7 @@ deps = { (Var("googlecode_url") % "googlemock") + "/trunk@386", "trunk/tools/gyp": - (Var("googlecode_url") % "gyp") + "/trunk@1080", + (Var("googlecode_url") % "gyp") + "/trunk@1107", # Needed by build/common.gypi. "trunk/tools/win/supalink":