From cb1df98093e8d29dbeee7c90cc7a32115d54680b Mon Sep 17 00:00:00 2001
From: "kjellander@webrtc.org"
 <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 4 Jul 2014 07:31:19 +0000
Subject: [PATCH] Roll chromium_revision 280876:281094

No significant DEPS changes in this roll, only some changes
in how clang_format is downloaded.

BUG=
TEST=Local testing as trybots currently cannot handle DEPS changes properly.
R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/20829004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6597 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 DEPS | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/DEPS b/DEPS
index 8629afb99..1ca77ae41 100644
--- a/DEPS
+++ b/DEPS
@@ -11,7 +11,7 @@ vars = {
   "googlecode_url": "http://%s.googlecode.com/svn",
   "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "280876",
+  "chromium_revision": "281094",
 
   # A small subset of WebKit is needed for the Android Python test framework.
   "webkit_trunk": "http://src.chromium.org/blink/trunk",
@@ -54,9 +54,6 @@ deps = {
   "third_party/clang_format":
     Var("chromium_trunk") + "/src/third_party/clang_format@" + Var("chromium_revision"),
 
-  "third_party/clang_format/script":
-    From("chromium_deps", "src/third_party/clang_format/script"),
-
   "third_party/colorama/src":
     From("chromium_deps", "src/third_party/colorama/src"),
 
@@ -316,7 +313,7 @@ hooks = [
                 "--platform=win32",
                 "--no_auth",
                 "--bucket", "chromium-clang-format",
-                "-s", Var("root_dir") + "/third_party/clang_format/bin/win/clang-format.exe.sha1",
+                "-s", Var("root_dir") + "/buildtools/win/clang-format.exe.sha1",
     ],
   },
   {
@@ -327,7 +324,7 @@ hooks = [
                 "--platform=darwin",
                 "--no_auth",
                 "--bucket", "chromium-clang-format",
-                "-s", Var("root_dir") + "/third_party/clang_format/bin/mac/clang-format.sha1",
+                "-s", Var("root_dir") + "/buildtools/mac/clang-format.sha1",
     ],
   },
   {
@@ -338,9 +335,18 @@ hooks = [
                 "--platform=linux*",
                 "--no_auth",
                 "--bucket", "chromium-clang-format",
-                "-s", Var("root_dir") + "/third_party/clang_format/bin/linux/clang-format.sha1",
+                "-s", Var("root_dir") + "/buildtools/linux64/clang-format.sha1",
     ],
   },
+  {
+    # Remove clang-format binaries from third_party/clang_format/bin that
+    # aren't used anymore.
+    # TODO(kjellander) remove this and the .gitignore entry after the end of
+    # July, 2014.
+    "name": "remove_old_clang_format_binaries",
+    "pattern": ".",
+    "action": ["python", "src/third_party/clang_format/bin/rm_binaries.py"],
+  },
   {
     # Pull clang if on Mac or clang is requested via GYP_DEFINES.
     "pattern": ".",