From d5115e0cacac492ff837bf8aeb26ce13b9b39f47 Mon Sep 17 00:00:00 2001 From: kjellander Date: Wed, 24 May 2017 00:57:03 -0700 Subject: [PATCH] Roll chromium_revision fc674bec51..cca67d31f4 (473937:474153) Memcheck suppression stacks changed slightly due to the googletest roll so a few suppressions needed to be updated. Change log: https://chromium.googlesource.com/chromium/src/+log/fc674bec51..cca67d31f4 Full diff: https://chromium.googlesource.com/chromium/src/+/fc674bec51..cca67d31f4 Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/14fe060b4d..414d17a2ac * src/build: https://chromium.googlesource.com/chromium/src/build/+log/b19d8a0c0e..5488ca8df8 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/4378a2bccb..e344c3eca3 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/34532746b5..2393ca4149 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/5530bd0f35..f336aafa2c * src/third_party/catapult: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/08a6e0ac16..f136f48001 * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/8c7f93feda..42bc671f47 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/e9c26b8d46..06b0b52a2c DEPS diff: https://chromium.googlesource.com/chromium/src/+/fc674bec51..cca67d31f4/DEPS No update to Clang. TBR= BUG=None NOTRY=True Review-Url: https://codereview.webrtc.org/2902923002 Cr-Commit-Position: refs/heads/master@{#18251} --- DEPS | 18 +++++++++--------- .../valgrind/memcheck/suppressions.txt | 18 ++++-------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/DEPS b/DEPS index 59bbeabeeb..9b680ea036 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'fc674bec51cf121f34d241830b037315f74a7f18', + 'chromium_revision': 'cca67d31f4a0b4ec2c20090a8bfc38c464274ab2', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -23,7 +23,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '08a6e0ac161db7309d8f9cad0ccd38e0b1fd41e0', + 'catapult_revision': 'f136f480014c1e52594e694c73320a5d56af0a04', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -34,15 +34,15 @@ deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - Var('chromium_git') + '/chromium/src/base' + '@' + '14fe060b4d23e3762d037b6240dc56fcee5eabef', + Var('chromium_git') + '/chromium/src/base' + '@' + '414d17a2acd9c9cd42747057c5439383ab32c8fc', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + 'b19d8a0c0ee0fb00c6982a7a3714efda621e94cc', + Var('chromium_git') + '/chromium/src/build' + '@' + '5488ca8df80a453c5c686e61be9c953f690a5463', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + '98f00fa10dbad2cdbb2e297a66c3d6d5bc3994f3', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '34532746b51d616fcd77269d03ca0ff31fad7a3d', + Var('chromium_git') + '/chromium/src/testing' + '@' + '2393ca4149d7f410fb454b95324ff9bb8fc8e32e', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '5530bd0f359f0a52d344e8d4e121c01f2ef55428', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'f336aafa2c7ca79e2b8b94c155c281263f309651', 'src/third_party/boringssl/src': Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'), 'src/third_party/catapult': @@ -52,7 +52,7 @@ deps = { 'src/third_party/ffmpeg': Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '28a5cdde5c32bcf66715343c10f74e85713f7aaf', 'src/third_party/googletest/src': - Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '8c7f93fedaca1b0158e67af0f5dd63a044066eab', + Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '42bc671f47b122fad36db5eccbc06868afdf7862', 'src/third_party/jsoncpp/source': Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248 @@ -77,7 +77,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + 'e9c26b8d467128bcd3d7de8824e0a28cc9e86c21', + Var('chromium_git') + '/chromium/src/tools' + '@' + '06b0b52a2c497820fef2799eda5eada6e93e570b', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'eb296f67da078ec01f5e3a9ea9cdc6d26d680161', 'src/tools/swarming_client': @@ -122,7 +122,7 @@ deps_os = { }, 'ios': { 'src/ios': - Var('chromium_git') + '/chromium/src/ios' + '@' + '4378a2bccb433ec4690b00b695a8d4aca9f97b3c', + Var('chromium_git') + '/chromium/src/ios' + '@' + 'e344c3eca3a0e7a222db507ec46c343ec750c5ed', }, 'unix': { 'src/third_party/lss': diff --git a/tools_webrtc/valgrind/memcheck/suppressions.txt b/tools_webrtc/valgrind/memcheck/suppressions.txt index f72a2d57a2..10d0bb927f 100644 --- a/tools_webrtc/valgrind/memcheck/suppressions.txt +++ b/tools_webrtc/valgrind/memcheck/suppressions.txt @@ -45,11 +45,7 @@ fun:vfprintf fun:vsnprintf fun:snprintf - fun:_ZN7testing12_GLOBAL__N_126PrintByteSegmentInObjectToEPKhmmPSo - fun:_ZN7testing9internal220PrintBytesInObjectToEPKhmPSo - fun:_ZN7testing8internal14DefaultPrintToISt6vectorIN6webrtc4rtcp3Fir7RequestESaIS6_EEEEviNS0_13bool_constantILb0EEERKT_PSo - fun:_ZN7testing8internal20MatchPrintAndExplainIKSt6vectorIN6webrtc4rtcp3Fir7RequestESaIS6_EERS9_EEbRT_RKNS_7MatcherIT0_EEPNS_19MatchResultListenerE - fun:_ZNK7testing8internal29PredicateFormatterFromMatcherINS0_18ElementsAreMatcherISt5tupleIJNS0_13BothOfMatcherINS_18PolymorphicMatcherINS0_12FieldMatcherIN6webrtc4rtcp3Fir7RequestEjEEEENS5_INS6_ISA_hEEEEEESF_EEEEEclISt6vectorISA_SaISA_EEEENS_15AssertionResultEPKcRKT_ + ... fun:_ZN6webrtc36RtcpPacketFirTest_TwoFciEntries_Test8TestBodyEv } { @@ -59,8 +55,7 @@ fun:vsnprintf fun:snprintf fun:_ZN7testing12_GLOBAL__N_126PrintByteSegmentInObjectToEPKhmmPSo - fun:_ZN7testing9internal220PrintBytesInObjectToEPKhmPSo - fun:_ZN7testing8internal25UntypedFunctionMockerBase17UntypedInvokeWithEPKv + ... fun:_ZNK6webrtc11MockRtpRtcp11FlexfecSsrcEv fun:_ZN6webrtc12PacketRouter16TimeToSendPacketEjtlbi fun:_ZN6webrtc38PacketRouterTest_TimeToSendPacket_Test8TestBodyEv @@ -72,10 +67,7 @@ fun:vsnprintf fun:snprintf fun:_ZN7testing12_GLOBAL__N_126PrintByteSegmentInObjectToEPKhmmPSo - fun:_ZN7testing9internal220PrintBytesInObjectToEPKhmPSo - fun:_ZN7testing8internal14DefaultPrintToISt6vectorIN6webrtc4rtcp3Fir7RequestESaIS6_EEEEviNS0_13bool_constantILb0EEERKT_PSo - fun:_ZN7testing8internal20MatchPrintAndExplainIKSt6vectorIN6webrtc4rtcp3Fir7RequestESaIS6_EERS9_EEbRT_RKNS_7MatcherIT0_EEPNS_19MatchResultListenerE - fun:_ZNK7testing8internal29PredicateFormatterFromMatcherINS0_18ElementsAreMatcherISt5tupleIJNS0_13BothOfMatcherINS_18PolymorphicMatcherINS0_12FieldMatcherIN6webrtc4rtcp3Fir7RequestEjEEEENS5_INS6_ISA_hEEEEEEEEEEEclISt6vectorISA_SaISA_EEEENS_15AssertionResultEPKcRKT_ + ... fun:_ZN6webrtc28RtcpPacketFirTest_Parse_Test8TestBodyEv } { @@ -485,9 +477,7 @@ fun:vfprintf fun:vsnprintf fun:snprintf - fun:_ZN7testing12_GLOBAL__N_126PrintByteSegmentInObjectToEPKhmmPSo - fun:_ZN7testing9internal220PrintBytesInObjectToEPKhmPSo - fun:_ZN7testing8internal25UntypedFunctionMockerBase17UntypedInvokeWithEPKv + ... fun:_ZNK6webrtc11MockRtpRtcp11FlexfecSsrcEv ... }