From aff1c8489f70f25b2195c7619d260f9fb0c4ae6a Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Mon, 1 Jun 2015 11:49:20 +0200 Subject: [PATCH] Roll chromium_revision ccef3cb..7779e7d (331232:332119) Relevant changes: * src/buildtools: dc487f4..fa660d4 * src/third_party/boringssl/src: a7997f1..bd15a8e * src/third_party/icu: 5788e27..f1ad7f9 * src/third_party/libvpx: d1c022c..77656a4 * src/third_party/nss: 9506806..aab0d08 * src/tools/gyp: 0bb6747..29e94a3 Details: https://chromium.googlesource.com/chromium/src/+/ccef3cb..7779e7d/DEPS Clang version changed 233105:238013 Details: https://chromium.googlesource.com/chromium/src/+/ccef3cb..7779e7d/tools/clang/scripts/update.sh This change identical to https://webrtc-codereview.appspot.com/47359004/ but with a TSan suppression added. BUG=3914 TBR=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/56569004 Cr-Commit-Position: refs/heads/master@{#9345} --- DEPS | 2 +- webrtc/build/sanitizers/tsan_suppressions_webrtc.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index b1935f2af9..98df02aa72 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': 'ccef3cb9a36b33a64fda7aa343e447079c17fbc5', + 'chromium_revision': '7779e7d30f6b9b0041e769ceffed59bdcfa85d4d', } # 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 0c37b8737b..f2ad6a567a 100644 --- a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc +++ b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc @@ -48,6 +48,8 @@ char kTSanDefaultSuppressions[] = "race:rtc::FireAndForgetAsyncClosure::Execute\n" "race:rtc::MessageQueueManager::Clear\n" "race:rtc::Thread::Clear\n" +// https://code.google.com/p/webrtc/issues/detail?id=3914 +"race:rtc::AsyncInvoker::~AsyncInvoker\n" // https://code.google.com/p/webrtc/issues/detail?id=2080 "race:webrtc/base/logging.cc\n" "race:webrtc/base/sharedexclusivelock_unittest.cc\n"