From 08ec4447bc0fc78fcdfc6e050287a1f478ba331b Mon Sep 17 00:00:00 2001 From: chromium-webrtc-autoroll Date: Thu, 12 Sep 2024 21:09:12 -0700 Subject: [PATCH] Roll chromium_revision 3b552b31ee..3b70d6f26c (1354345:1354985) Change log: https://chromium.googlesource.com/chromium/src/+log/3b552b31ee..3b70d6f26c Full diff: https://chromium.googlesource.com/chromium/src/+/3b552b31ee..3b70d6f26c Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/99dc460971..7f2a56694b * src/build: https://chromium.googlesource.com/chromium/src/build/+log/154f06e2b2..8e0612cd2c * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/34a8595e75..e4f992c066 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/774e1938da..8e01efd2a9 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/43f298a862..3f4138fcb1 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/b434c2e410..27c9b4efc2 * src/third_party/android_build_tools/manifest_merger/cipd: sa8Vo-ZxAsdWEoHTyymObnW4P7_yyEc7_fIpOF0A8VYC..JnUHT3SsYpv4WBlOV5VrBkuj2Q9SJ3cXlNHZ-u78L5IC * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android: version:2@1.6.4.cr1..version:2@1.8.1.cr1 * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm: version:2@1.6.4.cr1..version:2@1.8.1.cr1 * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava: version:2@1.6.4.cr1..version:2@1.8.1.cr1 * src/third_party/androidx/cipd: yP6G6XfDr70cKK951AWtO3Ebf1-Hd7HDWq9tISJOn8UC..-HPg6kSZtheePVbklOqBtMGHIYS9d0uoR7S-NfR5kGoC * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/c46e0e5bd6..296226a4a0 * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/17226d7965..d43a3eb748 * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/6711fb8465..91903c28af * src/third_party/libc++/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/6ae6f38d10..887f732df0 * src/third_party/libc++abi/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/11b62edaf2..29b2e9a0f4 * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/40477ffb51..97a5d7ed4d * src/third_party/r8/cipd: SfTjETaHqxbqyJ2oM5I95Iff9NJRgm9LHaDH03COwT0C..mqzE1g-dbf23PQ04w-4TpmupGkMOnZljVa993-MkzhIC * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/31966b2a47..453f7ad001 Added dependency * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm DEPS diff: https://chromium.googlesource.com/chromium/src/+/3b552b31ee..3b70d6f26c/DEPS No update to Clang. BUG=None Change-Id: If2e819e7fa7c9bd0769ced73081f5e71710c4e10 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/362485 Commit-Queue: Autoroller Bot-Commit: Autoroller Cr-Commit-Position: refs/heads/main@{#43018} --- DEPS | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/DEPS b/DEPS index 8db9832b27..ef0b48ac30 100644 --- a/DEPS +++ b/DEPS @@ -10,7 +10,7 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': '3b552b31eef4c0ae0a93bede4f6341f781be8d5f', + 'chromium_revision': '3b70d6f26cf7a1f53bcf227a621506727653902f', # Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to # process the raw profiles produced by instrumented targets (built with @@ -61,24 +61,24 @@ vars = { deps = { # TODO(kjellander): Move this to be Android-only. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@99dc46097171f9f57135d127c89ef3dba796bf87', + 'https://chromium.googlesource.com/chromium/src/base@7f2a56694b330c2cb2954eee78469ffc69952448', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@154f06e2b2ba1c3a631895e687f17611a623ffde', + 'https://chromium.googlesource.com/chromium/src/build@8e0612cd2c4e4d7c15a456384760815bdbd64ef1', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@34a8595e7595985d1b5ca6b6fb14a4a0ddd3b952', + 'https://chromium.googlesource.com/chromium/src/buildtools@e4f992c0660e6cee637c7b97aabf04d0a58d5555', # Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC. 'src/examples/androidtests/third_party/gradle': { 'url': 'https://chromium.googlesource.com/external/github.com/gradle/gradle.git@f2d1fb54a951d8b11d25748e4711bec8d128d7e3', 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@774e1938da53f1407c973522601e4a183460ffc9', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@8e01efd2a9dba90f0094ed0fa908a6e907410d74', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@43f298a86206d83e902e4e291f40ceb15cd8f8f8', + 'https://chromium.googlesource.com/chromium/src/testing@3f4138fcb15362469527d9310e21600dfdfab691', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@b434c2e4103c5849ecadef157d0382be3c83f843', + 'https://chromium.googlesource.com/chromium/src/third_party@27c9b4efc25d7ae5479b884a7d818058c6066d92', 'src/buildtools/linux64': { 'packages': [ @@ -126,9 +126,9 @@ deps = { 'src/third_party/clang-format/script': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@3c0acd2d4e73dd911309d9e970ba09d58bf23a62', 'src/third_party/libc++/src': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@6ae6f38d10eda881c16d91932348fc6d4ee98332', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@887f732df07adac7a67997ff0a91baa12081e5a2', 'src/third_party/libc++abi/src': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@11b62edaf245bb83bc259c37f269446cb34ef01e', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@29b2e9a0f48688da116692cb04758393053d269c', 'src/third_party/libunwind/src': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@dc70138c3e68e2f946585f134e20815851e26263', @@ -238,7 +238,7 @@ deps = { 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@6b0c5b7ee1988a14a4af94564e8ae8bba8a94374', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@c46e0e5bd633c5329040345a87aace0b2a0de1b3', + 'https://chromium.googlesource.com/catapult.git@296226a4a0067c8cffeb8831fb87526a8035f3cc', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, @@ -251,9 +251,9 @@ deps = { 'src/third_party/crc32c/src': 'https://chromium.googlesource.com/external/github.com/google/crc32c.git@d3d60ac6e0f16780bcfcc825385e1d338801a558', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@17226d7965e188c68162b4765ffaa24ec8883f52', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@d43a3eb748e40838c41e7a3ca53a3c6cbee0ea7a', 'src/third_party/ffmpeg': - 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@6711fb8465cfe929c554e1996285b9096584b89f', + 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@91903c28af60a732a051c343b496e1188eec9b05', 'src/third_party/flatbuffers/src': 'https://chromium.googlesource.com/external/github.com/google/flatbuffers.git@8db59321d9f02cdffa30126654059c7d02f70c32', 'src/third_party/grpc/src': { @@ -351,7 +351,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@40477ffb51d78b2b35aa049bcae0c4f8928235e6', + 'https://android.googlesource.com/platform/external/perfetto.git@97a5d7ed4d7ddb3844a5cbd184e241b99fe6ebcc', 'src/third_party/protobuf-javascript/src': Var('chromium_git') + '/external/github.com/protocolbuffers/protobuf-javascript' + '@' + 'e34549db516f8712f678fcd4bc411613b5cc5295', 'src/third_party/libvpx/source/libvpx': @@ -386,7 +386,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'SfTjETaHqxbqyJ2oM5I95Iff9NJRgm9LHaDH03COwT0C', + 'version': 'mqzE1g-dbf23PQ04w-4TpmupGkMOnZljVa993-MkzhIC', }, ], 'condition': 'checkout_android', @@ -410,7 +410,7 @@ deps = { 'condition': 'checkout_android', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@31966b2a47b42d1a011bbebac297c9b4ad412b89', + 'https://chromium.googlesource.com/chromium/src/tools@453f7ad001cd0d341ecb437eb164fd6c4b5cc08d', 'src/third_party/espresso': { 'packages': [ @@ -449,7 +449,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'yP6G6XfDr70cKK951AWtO3Ebf1-Hd7HDWq9tISJOn8UC', + 'version': '-HPg6kSZtheePVbklOqBtMGHIYS9d0uoR7S-NfR5kGoC', }, ], 'condition': 'checkout_android and non_git_source', @@ -460,7 +460,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/manifest_merger', - 'version': 'sa8Vo-ZxAsdWEoHTyymObnW4P7_yyEc7_fIpOF0A8VYC', + 'version': 'JnUHT3SsYpv4WBlOV5VrBkuj2Q9SJ3cXlNHZ-u78L5IC', }, ], 'condition': 'checkout_android', @@ -1498,7 +1498,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android', - 'version': 'version:2@1.6.4.cr1', + 'version': 'version:2@1.8.1.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -1509,7 +1509,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm', - 'version': 'version:2@1.6.4.cr1', + 'version': 'version:2@1.8.1.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -1520,7 +1520,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava', - 'version': 'version:2@1.6.4.cr1', + 'version': 'version:2@1.8.1.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm', + 'version': 'version:2@1.7.2.cr1', }, ], 'condition': 'checkout_android and non_git_source',