Roll chromium_revision 277350:280149
This fixes an error for GN (http://crrev.com/278107) Overview of changes in Chrome DEPS: $ svn diff http://src.chromium.org/chrome/trunk/src/DEPS -r 277350:280149 which can be compared with the output of: $ svn cat http://webrtc.googlecode.com/svn/trunk/DEPS | grep chromium_deps | sed 's/^ *//' | sort | uniq in a WebRTC checkout, gives the following relevant changes: * buildtools 5d8997:fb782d * third_party/android_tools c6e658:fbd420 * tools/gyp 1927:1944 * tools/swarming_client ae8085:aea506 BUG=3441 TEST=Local compile on most platforms (since trybots currently cannot detect DEPS-changes properly). R=niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/19809004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6550 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
12
DEPS
12
DEPS
@ -11,7 +11,7 @@ vars = {
|
|||||||
"googlecode_url": "http://%s.googlecode.com/svn",
|
"googlecode_url": "http://%s.googlecode.com/svn",
|
||||||
"sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
|
"sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
|
||||||
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
||||||
"chromium_revision": "277350",
|
"chromium_revision": "280149",
|
||||||
|
|
||||||
# A small subset of WebKit is needed for the Android Python test framework.
|
# A small subset of WebKit is needed for the Android Python test framework.
|
||||||
"webkit_trunk": "http://src.chromium.org/blink/trunk",
|
"webkit_trunk": "http://src.chromium.org/blink/trunk",
|
||||||
@ -137,6 +137,9 @@ deps = {
|
|||||||
"tools/gyp":
|
"tools/gyp":
|
||||||
From("chromium_deps", "src/tools/gyp"),
|
From("chromium_deps", "src/tools/gyp"),
|
||||||
|
|
||||||
|
"tools/memory":
|
||||||
|
Var("chromium_trunk") + "/src/tools/memory@" + Var("chromium_revision"),
|
||||||
|
|
||||||
"tools/protoc_wrapper":
|
"tools/protoc_wrapper":
|
||||||
Var("chromium_trunk") + "/src/tools/protoc_wrapper@" + Var("chromium_revision"),
|
Var("chromium_trunk") + "/src/tools/protoc_wrapper@" + Var("chromium_revision"),
|
||||||
|
|
||||||
@ -289,6 +292,13 @@ hooks = [
|
|||||||
"-s", Var("root_dir") + "/buildtools/linux32/gn.sha1",
|
"-s", Var("root_dir") + "/buildtools/linux32/gn.sha1",
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
# Remove GN binaries from tools/gn/bin that aren't used anymore.
|
||||||
|
# TODO(kjellander) remove after the end of July, 2014.
|
||||||
|
"name": "remove_old_gn_binaries",
|
||||||
|
"pattern": ".",
|
||||||
|
"action": ["python", Var("root_dir") + "/tools/gn/bin/rm_binaries.py"],
|
||||||
|
},
|
||||||
# Pull clang-format binaries using checked-in hashes.
|
# Pull clang-format binaries using checked-in hashes.
|
||||||
{
|
{
|
||||||
"name": "clang_format_win",
|
"name": "clang_format_win",
|
||||||
|
Reference in New Issue
Block a user