Roll chromium_revision ba5ff58b6c..94a136c73d (898571:898790)
This CL also includes updates to bit-exactness tests that started
to fail on linux_x86 after the update of clang that is part of
the Chromium Roll CL.
Change log: https://chromium.googlesource.com/chromium/src/+log/ba5ff58b6c..94a136c73d
Full diff: https://chromium.googlesource.com/chromium/src/+/ba5ff58b6c..94a136c73d
Changed dependencies
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/ecfc5939e4..da70c03d5c
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/6f773f2fd2..b11e004f56
* src/buildtools/linux64: git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943..git_revision:31f2bba8aafa8015ca5761100a21f17c2d741062
* src/buildtools/mac: git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943..git_revision:31f2bba8aafa8015ca5761100a21f17c2d741062
* src/buildtools/win: git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943..git_revision:31f2bba8aafa8015ca5761100a21f17c2d741062
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/837dc401ee..2d44844c9e
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/537028df55..7ec8dcae8b
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/ddfda49030..326e9a8fc7
* src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/f4ffdc1c0d..1f54e94bc3
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/b3f11721ed..0587b769f6
* src/tools/luci-go: git_revision:40f945205c8670537d14901c310374774f589254..git_revision:a5505c14c78e1a27562164fb55f7d2d8190a0a9b
* src/tools/luci-go: git_revision:40f945205c8670537d14901c310374774f589254..git_revision:a5505c14c78e1a27562164fb55f7d2d8190a0a9b
* src/tools/luci-go: git_revision:40f945205c8670537d14901c310374774f589254..git_revision:a5505c14c78e1a27562164fb55f7d2d8190a0a9b
DEPS diff: https://chromium.googlesource.com/chromium/src/+/ba5ff58b6c..94a136c73d/DEPS
Clang version changed llvmorg-13-init-14086-ge1b8fde1:llvmorg-13-init-14563-gbcaf57ca
Details: https://chromium.googlesource.com/chromium/src/+/ba5ff58b6c..94a136c73d/tools/clang/scripts/update.py
TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com,
BUG=webrtc:12941
Change-Id: Ibbbb25952bc6f33f418fec37b189c0068d3a6928
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/225141
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34423}
diff --git a/DEPS b/DEPS
index 0ee3f0a..d81b785 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
# chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
- 'chromium_revision': 'ba5ff58b6c232dff0bcd102caf3b1bb825a9d10c',
+ 'chromium_revision': '94a136c73dc94f17dc2ca7a0b037a3e7d86678d1',
# Keep the Chromium default of generating location tags.
'generate_location_tags': True,
@@ -20,9 +20,9 @@
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
- 'https://chromium.googlesource.com/chromium/src/base@ecfc5939e473aa3e6a1b4b1f6a04901b3f274dfe',
+ 'https://chromium.googlesource.com/chromium/src/base@da70c03d5c3296ec90a3bb3874f8a286a6fdf6be',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@6f773f2fd2d47e16bdc31eba5c578c87caf879af',
+ 'https://chromium.googlesource.com/chromium/src/build@b11e004f56269c7d65564257d3bc3a7c3ca2b13c',
'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@fd3f3c19981cd8fe4e4f11e0a7b8fb6cf329807e',
# Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC.
@@ -31,19 +31,19 @@
'condition': 'checkout_android',
},
'src/ios': {
- 'url': 'https://chromium.googlesource.com/chromium/src/ios@837dc401ee44df13a3045e0a579cba7ea2fcb039',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@2d44844c9e0de4b34ff1971836af5b5ebf79f6da',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@537028df553e1feeeab5dc691eaaf9a3276a6ed8',
+ 'https://chromium.googlesource.com/chromium/src/testing@7ec8dcae8b2984cd4f9f7095e92321287613420a',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@ddfda490302ff0f31a4de48e7b862452220a62e2',
+ 'https://chromium.googlesource.com/chromium/src/third_party@326e9a8fc741c67f8d715f20fb1d9d65c348adf6',
'src/buildtools/linux64': {
'packages': [
{
'package': 'gn/gn/linux-amd64',
- 'version': 'git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943',
+ 'version': 'git_revision:31f2bba8aafa8015ca5761100a21f17c2d741062',
}
],
'dep_type': 'cipd',
@@ -53,7 +53,7 @@
'packages': [
{
'package': 'gn/gn/mac-${{arch}}',
- 'version': 'git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943',
+ 'version': 'git_revision:31f2bba8aafa8015ca5761100a21f17c2d741062',
}
],
'dep_type': 'cipd',
@@ -63,7 +63,7 @@
'packages': [
{
'package': 'gn/gn/windows-amd64',
- 'version': 'git_revision:4d207c94eab41f09c9a8505eb47f3d2919e47943',
+ 'version': 'git_revision:31f2bba8aafa8015ca5761100a21f17c2d741062',
}
],
'dep_type': 'cipd',
@@ -214,7 +214,7 @@
'condition': 'checkout_android',
},
'src/third_party/perfetto':
- 'https://android.googlesource.com/platform/external/perfetto.git@f4ffdc1c0d10c444b6ca626319d6cdb20f8edae4',
+ 'https://android.googlesource.com/platform/external/perfetto.git@1f54e94bc36a5e662a09896ccafa0213284cad5c',
'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@eebc5cd487a89c51ba148f6d6ac45779970f72d7',
'src/third_party/libyuv':
@@ -271,7 +271,7 @@
'condition': 'checkout_win',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@b3f11721ed0092ac73e0fdb2bb9b9c07db7c484a',
+ 'https://chromium.googlesource.com/chromium/src/tools@0587b769f66efead95078fddac276406ab225b44',
'src/tools/swarming_client':
'https://chromium.googlesource.com/infra/luci/client-py.git@a32a1607f6093d338f756c7e7c7b4333b0c50c9c',
@@ -477,15 +477,15 @@
'packages': [
{
'package': 'infra/tools/luci/isolate/${{platform}}',
- 'version': 'git_revision:40f945205c8670537d14901c310374774f589254',
+ 'version': 'git_revision:a5505c14c78e1a27562164fb55f7d2d8190a0a9b',
},
{
'package': 'infra/tools/luci/isolated/${{platform}}',
- 'version': 'git_revision:40f945205c8670537d14901c310374774f589254',
+ 'version': 'git_revision:a5505c14c78e1a27562164fb55f7d2d8190a0a9b',
},
{
'package': 'infra/tools/luci/swarming/${{platform}}',
- 'version': 'git_revision:40f945205c8670537d14901c310374774f589254',
+ 'version': 'git_revision:a5505c14c78e1a27562164fb55f7d2d8190a0a9b',
},
],
'dep_type': 'cipd',
diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
index b093b43..7465456 100644
--- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc
+++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
@@ -921,7 +921,13 @@
TEST_F(AcmReceiverBitExactnessOldApi, 8kHzOutput) {
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "e0c966d7b8c36ff60167988fa35d33e0"
+// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
+// checksum.
+#if defined(WEBRTC_LINUX) && defined(NDEBUG)
+ : "5af28619e3a3c606b2242c9a12f4f64e";
+#else
: "7d8f6b84abd1e57ec010a53bc2130652";
+#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "405a50f0bcb8827e20aa944299fc59f6"
: "0ed5830930f5527a01bbec0ba11f8541";
@@ -936,7 +942,14 @@
TEST_F(AcmReceiverBitExactnessOldApi, 16kHzOutput) {
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "a63c578e1195c8420f453962c6d8519c"
+
+// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
+// checksum.
+#if defined(WEBRTC_LINUX) && defined(NDEBUG)
+ : "f788cc9200ac4a7d498d9081987808a3";
+#else
: "6bac83762c1306b932cd25a560155681";
+#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "58fd62a5c49ee513f9fa6fe7dbf62c97"
: "0509cf0672f543efb4b050e8cffefb1d";
@@ -951,7 +964,13 @@
TEST_F(AcmReceiverBitExactnessOldApi, 32kHzOutput) {
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "8775ce387f44dc5ff4a26da295d5ee7c"
+// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
+// checksum.
+#if defined(WEBRTC_LINUX) && defined(NDEBUG)
+ : "5b84b2a179cb8533a8f9bcd19612e7f0";
+#else
: "e319222ca47733709f90fdf33c8574db";
+#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "04ce6a1dac5ffdd8438d804623d0132f"
: "39a4a7a1c455b35baeffb9fd193d7858";
@@ -966,7 +985,13 @@
TEST_F(AcmReceiverBitExactnessOldApi, 48kHzOutput) {
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "7a55700b7ca9aa60237db58b33e55606"
+// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
+// checksum.
+#if defined(WEBRTC_LINUX) && defined(NDEBUG)
+ : "a2459749062f96297283cce4a8c7e6db";
+#else
: "57d1d316c88279f4f3da3511665069a9";
+#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "f59833d9b0924f4b0704707dd3589f80"
: "74cbe7345e2b6b45c1e455a5d1e921ca";
@@ -1055,7 +1080,13 @@
new rtc::RefCountedObject<ADFactory>);
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "7a55700b7ca9aa60237db58b33e55606"
+// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
+// checksum.
+#if defined(WEBRTC_LINUX) && defined(NDEBUG)
+ : "a2459749062f96297283cce4a8c7e6db";
+#else
: "57d1d316c88279f4f3da3511665069a9";
+#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "f59833d9b0924f4b0704707dd3589f80"
: "74cbe7345e2b6b45c1e455a5d1e921ca";
@@ -1326,7 +1357,13 @@
TEST_F(AcmSenderBitExactnessOldApi, MAYBE_IsacSwb30ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 32000, 1, 104, 960, 960));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
+// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
+// checksum.
+#if defined(WEBRTC_LINUX) && defined(NDEBUG) && defined(WEBRTC_ARCH_X86)
+ "13d4d2a4c9e8e94a4b74a176e4bf7cc4",
+#else
"5683b58da0fbf2063c7adc2e6bfb3fb8",
+#endif
"2b3c387d06f00b7b7aad4c9be56fb83d", "android_arm32_audio",
"android_arm64_audio", "android_arm64_clang_audio",
"5683b58da0fbf2063c7adc2e6bfb3fb8"),
diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
index 78d0f88..bdd90e9 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_unittest.cc
@@ -82,17 +82,29 @@
const std::string input_rtp_file =
webrtc::test::ResourcePath("audio_coding/neteq_universal_new", "rtp");
- const std::string output_checksum =
- PlatformChecksum("6c35140ce4d75874bdd60aa1872400b05fd05ca2",
- "ab451bb8301d9a92fbf4de91556b56f1ea38b4ce", "not used",
- "6c35140ce4d75874bdd60aa1872400b05fd05ca2",
- "64b46bb3c1165537a880ae8404afce2efba456c0");
+ const std::string output_checksum = PlatformChecksum(
+// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
+// checksum.
+#if defined(WEBRTC_LINUX) && defined(NDEBUG) && defined(WEBRTC_ARCH_X86)
+ "8d9c177b7f2f9398c0944a851edffae214de2c56",
+#else
+ "6c35140ce4d75874bdd60aa1872400b05fd05ca2",
+#endif
+ "ab451bb8301d9a92fbf4de91556b56f1ea38b4ce", "not used",
+ "6c35140ce4d75874bdd60aa1872400b05fd05ca2",
+ "64b46bb3c1165537a880ae8404afce2efba456c0");
- const std::string network_stats_checksum =
- PlatformChecksum("90594d85fa31d3d9584d79293bf7aa4ee55ed751",
- "77b9c3640b81aff6a38d69d07dd782d39c15321d", "not used",
- "90594d85fa31d3d9584d79293bf7aa4ee55ed751",
- "90594d85fa31d3d9584d79293bf7aa4ee55ed751");
+ const std::string network_stats_checksum = PlatformChecksum(
+// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
+// checksum.
+#if defined(WEBRTC_LINUX) && defined(NDEBUG) && defined(WEBRTC_ARCH_X86)
+ "8cc08e3cd6801dcba4fcc15eb4036c19296a140d",
+#else
+ "90594d85fa31d3d9584d79293bf7aa4ee55ed751",
+#endif
+ "77b9c3640b81aff6a38d69d07dd782d39c15321d", "not used",
+ "90594d85fa31d3d9584d79293bf7aa4ee55ed751",
+ "90594d85fa31d3d9584d79293bf7aa4ee55ed751");
DecodeAndCompare(input_rtp_file, output_checksum, network_stats_checksum,
absl::GetFlag(FLAGS_gen_ref));
