From 75047dc88eca140ebb3acb38776f209c4b2bff20 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Wed, 14 Mar 2012 09:20:59 +0000 Subject: [PATCH] Rolled back YASM to versions we know are working. The idea here is to attempt to provide a short-term solution to the flaky YASM failures on the windows bots. We could run with this a bit, and if the errors cease we know it is a bug in YASM and can perhaps proceed to report a bug on YASM. This is probably not a good long-term solution since I guess we want to use the same tools as Chrome. This effectively rolls back the YASM version changes of r1755 (see http://code.google.com/p/webrtc/source/diff?spec=svn1755&r=1755&format=side&path=/trunk/DEPS) BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/453005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1886 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 7f2d8f353..813b7074b 100644 --- a/DEPS +++ b/DEPS @@ -54,10 +54,14 @@ deps = { Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"), "trunk/third_party/yasm": - Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"), + Var("chromium_trunk") + "/src/third_party/yasm@120526", + + # Used by libjpeg-turbo + "trunk/third_party/yasm/binaries": + Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228", "trunk/third_party/yasm/source/patched-yasm": - From("trunk/chromium_deps", "src/third_party/yasm/source/patched-yasm"), + Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761", "trunk/tools/clang": Var("chromium_trunk") + "/src/tools/clang@" + Var("chromium_revision"),