From 909f494b4384d39f39e0f3f3abe13b06ea2ac8d5 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Tue, 3 Mar 2015 07:20:59 +0000 Subject: [PATCH] Roll chromium_revision 2c3ffb2..e144d30 (317530:318658) Relevant changes: * src/third_party/boringssl/src: b180ee9..09bdb2a * src/third_party/icu: 2081ee6..df1bf38 * src/third_party/libvpx: 33bbffe..080710f * src/third_party/openmax_dl: 21c8abe..6658243 Details: https://chromium.googlesource.com/chromium/src/+/2c3ffb2..e144d30/DEPS Clang version was not updated in this roll. BUG=webm:962 R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/43519004 Cr-Commit-Position: refs/heads/master@{#8565} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8565 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- webrtc/build/sanitizers/tsan_suppressions_webrtc.cc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index cffbf25199..acd57192af 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '2c3ffb2355a27c32f45e508ef861416b820c823b', + 'chromium_revision': 'e144d30232209034b82d544926070bb8dc62f6ec', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc index 4015803492..f3bfe29435 100644 --- a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc +++ b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc @@ -74,6 +74,10 @@ char kTSanDefaultSuppressions[] = "deadlock:webrtc::ViEEncoder::OnLocalSsrcChanged\n" "deadlock:webrtc::ViESender::RegisterSendTransport\n" +// third_party/libvpx race introduced in 33bbffe..080710f range. +// TODO(kjellander): https://code.google.com/p/webm/issues/detail?id=962 +"race:vp9_reconintra.c\n" + // TODO(pbos): Trace events are racy due to lack of proper POD atomics. // https://code.google.com/p/webrtc/issues/detail?id=2497 "race:*trace_event_unique_catstatic*\n"