Roll chromium_revision 260462:266514
Unfortunately needs to introduce yet another workaround script for the Visual Studio toolchain download. This will resolve the failures with our Dr Memory Full bot (see https://code.google.com/p/chromium/issues/detail?id=366637#c2 for details). Long term, I'm considering a better approach than using the added gclient solution pointing at svn://svn-mirror.golo.chromium.org/chrome/trunk/deps/third_party/drmemory/drmemory.DEPS i.e. add an entry that we roll separately in our DEPS file instead. However, the Dr Memory team assured that changes in their reporting format like this are rare. Thanks fischman@ for the video_render.gypi fix! Thanks kma@ for the transform_neon.S fix even if it turned out not to be needed right now (probably will come back). BUG=chromium:366637 TEST=git try -t compile R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/13369007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6010 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
36
DEPS
36
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": "260462",
|
||||
"chromium_revision": "266514",
|
||||
|
||||
# A small subset of WebKit is needed for the Android Python test framework.
|
||||
"webkit_trunk": "http://src.chromium.org/blink/trunk",
|
||||
@@ -42,6 +42,9 @@ deps = {
|
||||
"testing/gtest":
|
||||
From("chromium_deps", "src/testing/gtest"),
|
||||
|
||||
"third_party/binutils":
|
||||
Var("chromium_trunk") + "/src/third_party/binutils@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/clang_format":
|
||||
Var("chromium_trunk") + "/src/third_party/clang_format@" + Var("chromium_revision"),
|
||||
|
||||
@@ -68,6 +71,18 @@ deps = {
|
||||
"third_party/junit/":
|
||||
(Var("googlecode_url") % "webrtc") + "/deps/third_party/junit@3367",
|
||||
|
||||
"third_party/libc++":
|
||||
Var("chromium_trunk") + "/src/third_party/libc++@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/libc++/trunk":
|
||||
From("chromium_deps", "src/third_party/libc++/trunk"),
|
||||
|
||||
"third_party/libc++abi":
|
||||
Var("chromium_trunk") + "/src/third_party/libc++abi@" + Var("chromium_revision"),
|
||||
|
||||
"third_party/libc++abi/trunk":
|
||||
From("chromium_deps", "src/third_party/libc++abi/trunk"),
|
||||
|
||||
"third_party/libjpeg":
|
||||
Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"),
|
||||
|
||||
@@ -183,11 +198,6 @@ deps_os = {
|
||||
Var("chromium_trunk") + "/src/testing/iossim@" + Var("chromium_revision"),
|
||||
},
|
||||
|
||||
"unix": {
|
||||
"third_party/gold":
|
||||
From("chromium_deps", "src/third_party/gold"),
|
||||
},
|
||||
|
||||
"android": {
|
||||
# Precompiled tools needed for Android test execution. Needed since we can't
|
||||
# compile them from source in WebRTC since they depend on Chromium's base.
|
||||
@@ -302,6 +312,20 @@ hooks = [
|
||||
"action": ["python", Var("root_dir") + "/tools/clang/scripts/update.py",
|
||||
"--if-needed"],
|
||||
},
|
||||
{
|
||||
# Update the Windows toolchain if necessary.
|
||||
"name": "win_toolchain",
|
||||
"pattern": ".",
|
||||
"action": ["python",
|
||||
Var("root_dir") + "/webrtc/build/download_vs_toolchain.py",
|
||||
"update"],
|
||||
},
|
||||
{
|
||||
# Pull binutils for gold.
|
||||
"name": "binutils",
|
||||
"pattern": ".",
|
||||
"action": ["python", Var("root_dir") + "/third_party/binutils/download.py"],
|
||||
},
|
||||
{
|
||||
# Download test resources, i.e. video and audio files from Google Storage.
|
||||
"pattern": "\\.sha1",
|
||||
|
||||
Reference in New Issue
Block a user