generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roll chromium_revision 280876:281479

Browse Source 
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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6636 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrikg@webrtc.org 2014-07-09 13:03:39 +00:00
parent 045a9b17da
commit 543da997f2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DEPS
View File

@ -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": "281479",
# 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", Var("root_dir") + "/third_party/clang_format/bin/rm_binaries.py"],
},
{
# Pull clang if on Mac or clang is requested via GYP_DEFINES.
"pattern": ".",