diff options
| author | henrikg@webrtc.org <henrikg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 07:08:32 +0000 |
|---|---|---|
| committer | henrikg@webrtc.org <henrikg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 07:08:32 +0000 |
| commit | e91ba268e3b33474d53029f5e21181058814204f (patch) | |
| tree | 787d718f995c55b927448b0dc0d4ef53d6b01640 /DEPS | |
| parent | 02dce515d344c5941ee10adce573b02b1a614dc9 (diff) | |
| download | webrtc-e91ba268e3b33474d53029f5e21181058814204f.tar.gz | |
Revert 6643 "Revert 6637 "Revert 6636 "Roll chromium_revision 28..."
Ha. Of course if won't work since a newer revision is required that pulls in the GN fix.
> Revert 6637 "Revert 6636 "Roll chromium_revision 280876:281479""
>
> GN issue should be fixed in http://crrev.com/282138.
>
> > Revert 6636 "Roll chromium_revision 280876:281479"
> >
> > Still breaks GN bot.
> >
> > > Roll chromium_revision 280876:281479
> > >
> > > No significant DEPS changes in this roll, only some changes in how clang_format is downloaded. clang_format changes based on https://webrtc-codereview.appspot.com/20829004 which was reverted.
> > >
> > > Review URL: https://webrtc-codereview.appspot.com/19929004
> >
> > TBR=henrikg@webrtc.org
> >
> > Review URL: https://webrtc-codereview.appspot.com/14909004
>
> TBR=henrikg@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/20899004
TBR=henrikg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14919004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6644 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 20 |
1 files changed, 7 insertions, 13 deletions
@@ -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": "281479", + "chromium_revision": "280876", # A small subset of WebKit is needed for the Android Python test framework. "webkit_trunk": "http://src.chromium.org/blink/trunk", @@ -54,6 +54,9 @@ 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"), @@ -313,7 +316,7 @@ hooks = [ "--platform=win32", "--no_auth", "--bucket", "chromium-clang-format", - "-s", Var("root_dir") + "/buildtools/win/clang-format.exe.sha1", + "-s", Var("root_dir") + "/third_party/clang_format/bin/win/clang-format.exe.sha1", ], }, { @@ -324,7 +327,7 @@ hooks = [ "--platform=darwin", "--no_auth", "--bucket", "chromium-clang-format", - "-s", Var("root_dir") + "/buildtools/mac/clang-format.sha1", + "-s", Var("root_dir") + "/third_party/clang_format/bin/mac/clang-format.sha1", ], }, { @@ -335,19 +338,10 @@ hooks = [ "--platform=linux*", "--no_auth", "--bucket", "chromium-clang-format", - "-s", Var("root_dir") + "/buildtools/linux64/clang-format.sha1", + "-s", Var("root_dir") + "/third_party/clang_format/bin/linux/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", Var("root_dir") + "/third_party/clang_format/bin/rm_binaries.py"], - }, - { # Pull clang if on Mac or clang is requested via GYP_DEFINES. "pattern": ".", "action": ["python", Var("root_dir") + "/tools/clang/scripts/update.py", |