From 8d5b344b05e2415be08d31a21c09f89c1d220741 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Mon, 9 Dec 2024 14:23:04 +0100 Subject: [PATCH] Roll chromium_revision 030af8fbf0..edc5771bf9 (1368717:1393593) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change log: https://chromium.googlesource.com/chromium/src/+log/030af8fbf0..edc5771bf9 Full diff: https://chromium.googlesource.com/chromium/src/+/030af8fbf0..edc5771bf9 Changed dependencies * fuchsia_version: version:24.20241014.3.1..version:26.20241203.6.1 * reclient_version: re_client_version:0.168.0.c46e68bc-gomaip..re_client_version:0.172.0.3cf60ba5-gomaip * src/base: https://chromium.googlesource.com/chromium/src/base/+log/69f3676cdb..189a044d69 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/05874e6c94..351a8c7f44 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/db0eae9640..ba1ffdb859 * src/buildtools/linux64: git_revision:feafd1012a32c05ec6095f69ddc3850afb621f3a..git_revision:468c6128db7fabe32a29d4753460ef53594406fc * src/buildtools/mac: git_revision:feafd1012a32c05ec6095f69ddc3850afb621f3a..git_revision:468c6128db7fabe32a29d4753460ef53594406fc * src/buildtools/reclient: re_client_version:0.168.0.c46e68bc-gomaip..re_client_version:0.172.0.3cf60ba5-gomaip * src/buildtools/win: git_revision:feafd1012a32c05ec6095f69ddc3850afb621f3a..git_revision:468c6128db7fabe32a29d4753460ef53594406fc * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/452c8ab216..7bcd9c24de * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/eac4c18f74..aab53ebd79 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/9d80a193fb..832ec8a32c * src/third_party/android_build_tools/aapt2/cipd: cfGQ9GV4juNnGZIPzTmaL3ehiZM1hs6UsB5HUA8fT6oC..JPmxYHMZl4VH2Umf2-flGSdTVHtNDdFBmXd7v1Gs7EoC * src/third_party/android_build_tools/bundletool/cipd: sZ24OFOduSafn8fvR3ajsGS6KP_oS_Tq0Cw3SA8XiD0C..Q-7KJYcc15Cn9iVy-7bk0tPH9-oUrhqHis6HmUzck80C * src/third_party/android_build_tools/error_prone/cipd: hUxlP8GvC1xhmZ6r9xjYau2laPlzHbs_P2emx4ZL4jgC..ClNqEKjHuNFTgplEe3HujivpADFDjRs0H0ijhyVUg2gC * src/third_party/android_build_tools/manifest_merger/cipd: rnIeJMlGw7adxOKZofLsm7tdYaOy1nHivJn9ck7ocVkC..ltqylfWRbafoft_Pjhfb4NciQwCb3J4PAkpcTZA7lW0C * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth: version:2@20.1.0.cr1..version:2@21.1.1.cr1 * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_api_phone: version:2@18.0.1.cr1..version:2@18.0.2.cr1 * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_base: version:2@18.0.2.cr1..version:2@18.0.10.cr1 * src/third_party/android_deps/cipd/libs/com_squareup_okio_okio_jvm: version:2@3.9.0.cr1..version:2@3.9.1.cr1 * src/third_party/androidx/cipd: k1wif7sS51pJGSFGN7FAeGWDorxgPart9E1f383TQL4C..w6ABIi35Hbkb4RHJCx4sSWDpt7W9rBvJFkcPVufgZMIC * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/0fa9014d86..9559c4566a * src/third_party/breakpad/breakpad: https://chromium.googlesource.com/breakpad/breakpad.git/+log/6b0c5b7ee1..02dd5c3ffb * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/4479191661..4899cc831c * src/third_party/clang-format/script: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git/+log/3c0acd2d4e..37f6e68a10 * src/third_party/dav1d/libdav1d: https://chromium.googlesource.com/external/github.com/videolan/dav1d.git/+log/389450f61e..d242c47b43 * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/20b9bdcace..8d20c1e0b5 * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/686d694450..591ae4b02e * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/f02bffad0f..0ae7e60737 * src/third_party/google_benchmark/src: https://chromium.googlesource.com/external/github.com/google/benchmark.git/+log/344117638c..761305ec3b * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/62df7bdbc1..35d0c36560 * src/third_party/harfbuzz-ng/src: https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/1da053e87f..1c249be96e * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/4239b1559d..ba7ed88cc5 * src/third_party/jdk/current: BXZwbslDFpYhPRuG8hBh2z7ApP36ZG-ZfkBWrkpnPl4C..U-h0kbYoIUjL__n_sfiudzFLH7-C9vKVsLSOA2XHkBEC * src/third_party/kotlin_stdlib/cipd: XJ7_doI-Qt7GFaSQ9BNo-3qF7Gv2--9Sa8GEUdjxMTUC..O9XlYa2GU1tlWmQ40OrK2Bekxjt372NtG5pMD-QyNaYC * src/third_party/kotlinc/current: FNZSCjJ6yKsi6oRcgQrt-lX0MDlaWoxT7gPTz0CjLhMC..HckNA1Q54JBiHrpY1gP5qblVCdeuVmGsiGCdv1XjqywC * src/third_party/libFuzzer/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git/+log/487e793763..e31b999178 * src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/840f879787..ff9badefdf * src/third_party/libc++/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/6a68fd412b..619ccf0515 * src/third_party/libc++abi/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/9a1d90c3b4..1bf8357272 * src/third_party/libsrtp: https://chromium.googlesource.com/chromium/deps/libsrtp.git/+log/000edd7914..a52756acb1 * src/third_party/libunwind/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/efc3baa2d1..6066b14957 * src/third_party/libunwindstack: https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git/+log/a3bb4cd02e..215bddfd8e * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/906334ac1d..6f0c446c7b * src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/a8e59d2074..307b951229 * src/third_party/llvm-libc/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git/+log/98ed093183..ab4e0ad953 * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/e57316a6ae..d3990a1c9d * src/third_party/r8/cipd: -i5fwP_NzM6Ylg5AsSGEotYN7hQgV852gXCslvXIrRwC..hmRsAQA2HG0DR196Odv3OKZYk-2Ul43tCtzrCyfWpEQC * src/third_party/r8/d8/cipd: 3KCj5eRYCvGGYs5i90pRaeihkzsqgUGc4OkICT8AOlIC..o7pbwAFk68RQBPYLlCUm0mQ6B3Bj9pykXOPvv8akR5kC * src/third_party/rust-toolchain_version: Linux_x64/rust-toolchain-009e73825af0e59ad4fc603562e038b3dbd6593a-2-llvmorg-20-init-3847-g69c43468.tar.xz,Mac/rust-toolchain-009e73825af0e59ad4fc603562e038b3dbd6593a-2-llvmorg-20-init-3847-g69c43468.tar.xz,Mac_arm64/rust-toolchain-009e73825af0e59ad4fc603562e038b3dbd6593a-2-llvmorg-20-init-3847-g69c43468.tar.xz,Win/rust-toolchain-009e73825af0e59ad4fc603562e038b3dbd6593a-2-llvmorg-20-init-3847-g69c43468.tar.xz..Linux_x64/rust-toolchain-a522d78598415cdd614ccc6d961160f192f64b5c-1-llvmorg-20-init-13894-g8cb44859.tar.xz,Mac/rust-toolchain-a522d78598415cdd614ccc6d961160f192f64b5c-1-llvmorg-20-init-13894-g8cb44859.tar.xz,Mac_arm64/rust-toolchain-a522d78598415cdd614ccc6d961160f192f64b5c-1-llvmorg-20-init-13894-g8cb44859.tar.xz,Win/rust-toolchain-a522d78598415cdd614ccc6d961160f192f64b5c-1-llvmorg-20-init-13894-g8cb44859.tar.xz * src/third_party/turbine/cipd: vSia3h9tzpwpP_goLj4HMdl7_FEB5iVCv9nU5ZXOfIMC..c4onccFJcd8rKHM_6js-X_ucjXdFqhDWK8aUX4ARSkkC * src/third_party/zstd/src: https://chromium.googlesource.com/external/github.com/facebook/zstd.git/+log/7fb5347e88..b0a179d469 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/c809c41331..ae13111c68 Added dependencies * src/third_party/android_deps/cipd/libs/com_google_android_libraries_identity_googleid_googleid * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_blockstore * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_fido DEPS diff: https://chromium.googlesource.com/chromium/src/+/030af8fbf0..edc5771bf9/DEPS Clang version changed llvmorg-20-init-6794-g3dbd929e:llvmorg-20-init-13894-g8cb44859 Details: https://chromium.googlesource.com/chromium/src/+/030af8fbf0..edc5771bf9/tools/clang/scripts/update.py BUG=webrtc:383026404 Change-Id: I9570d31fc173189c3728f90e33d4ea5947615c0a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/370710 Reviewed-by: Björn Terelius Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#43519} --- DEPS | 137 +++++++++++++++++++++------------- tools_webrtc/get_landmines.py | 2 + 2 files changed, 87 insertions(+), 52 deletions(-) diff --git a/DEPS b/DEPS index bb28531a8d..6c46044161 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': '030af8fbf08f2bb06397304628f15b2d3bdb90d0', + 'chromium_revision': 'edc5771bf97c2fc8dafde8f6a50f1e45718ca406', # Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to # process the raw profiles produced by instrumented targets (built with @@ -33,7 +33,7 @@ vars = { # By default, download the fuchsia sdk from the public sdk directory. 'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/core/', - 'fuchsia_version': 'version:24.20241014.3.1', + 'fuchsia_version': 'version:26.20241203.6.1', # By default, download the fuchsia images from the fuchsia GCS bucket. 'fuchsia_images_bucket': 'fuchsia', 'checkout_fuchsia': False, @@ -48,7 +48,7 @@ vars = { # RBE instance to use for running remote builds 'rbe_instance': 'projects/rbe-webrtc-developer/instances/default_instance', # reclient CIPD package version - 'reclient_version': 're_client_version:0.168.0.c46e68bc-gomaip', + 'reclient_version': 're_client_version:0.172.0.3cf60ba5-gomaip', # ninja CIPD package. 'ninja_package': 'infra/3pp/tools/ninja/', @@ -64,30 +64,30 @@ vars = { deps = { # TODO(kjellander): Move this to be Android-only. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@69f3676cdbd05660c136a6cc3b23383cbabe53d8', + 'https://chromium.googlesource.com/chromium/src/base@189a044d69a76341930a01113214f84a7d4b273f', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@05874e6c9429039f1747034af61de1fe2ea1ed06', + 'https://chromium.googlesource.com/chromium/src/build@351a8c7f444ed14e73ea9eb44866a42248daeb31', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@db0eae9640184fb132061f248f6108771a6ea2d4', + 'https://chromium.googlesource.com/chromium/src/buildtools@ba1ffdb8594e10776090bdeab00385763d4aff51', # 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@452c8ab2166e50fe43484dd3da5e19ce14a68e6b', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@7bcd9c24de42d68c8abf22036164673d0d533baa', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@eac4c18f749488d7232af275405e0e1b67d84cb3', + 'https://chromium.googlesource.com/chromium/src/testing@aab53ebd793179cdbbab2c259d9aec3be3b09de2', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@9d80a193fbfe8e2f2a29be2efeee93de9a826dcb', + 'https://chromium.googlesource.com/chromium/src/third_party@832ec8a32cd0e108c6496c624a4fb219f608bb46', 'src/buildtools/linux64': { 'packages': [ { 'package': 'gn/gn/linux-${{arch}}', - 'version': 'git_revision:feafd1012a32c05ec6095f69ddc3850afb621f3a', + 'version': 'git_revision:468c6128db7fabe32a29d4753460ef53594406fc', } ], 'dep_type': 'cipd', @@ -97,7 +97,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/mac-${{arch}}', - 'version': 'git_revision:feafd1012a32c05ec6095f69ddc3850afb621f3a', + 'version': 'git_revision:468c6128db7fabe32a29d4753460ef53594406fc', } ], 'dep_type': 'cipd', @@ -107,7 +107,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/windows-amd64', - 'version': 'git_revision:feafd1012a32c05ec6095f69ddc3850afb621f3a', + 'version': 'git_revision:468c6128db7fabe32a29d4753460ef53594406fc', } ], 'dep_type': 'cipd', @@ -162,15 +162,15 @@ deps = { }, 'src/third_party/clang-format/script': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@3c0acd2d4e73dd911309d9e970ba09d58bf23a62', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@37f6e68a107df43b7d7e044fd36a13cbae3413f2', 'src/third_party/libc++/src': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@6a68fd412b9aecd515a20a7cf84d11b598bfaf96', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@619ccf05152d4612fac76ba5899094704f3661dd', 'src/third_party/libc++abi/src': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@9a1d90c3b412d5ebeb97a6e33d98e1d0dd923221', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@1bf83572723e3cb921345f9f80d1e462c4b9745b', 'src/third_party/llvm-libc/src': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git@98ed09318387deb45282ca1c92a384499860b76a', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git@ab4e0ad95354c43a8afbcb3f19b4bee6066a90c5', 'src/third_party/libunwind/src': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@efc3baa2d1ece3630fcfa72bef93ed831bcaec4c', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@6066b149576465160ac0d935aa644ec6d3bfb2bf', 'src/third_party/test_fonts/test_fonts': { 'dep_type': 'gcs', @@ -222,7 +222,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/aapt2', - 'version': 'cfGQ9GV4juNnGZIPzTmaL3ehiZM1hs6UsB5HUA8fT6oC', + 'version': 'JPmxYHMZl4VH2Umf2-flGSdTVHtNDdFBmXd7v1Gs7EoC', }, ], 'condition': 'checkout_android', @@ -233,7 +233,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/bundletool', - 'version': 'sZ24OFOduSafn8fvR3ajsGS6KP_oS_Tq0Cw3SA8XiD0C', + 'version': 'Q-7KJYcc15Cn9iVy-7bk0tPH9-oUrhqHis6HmUzck80C', }, ], 'condition': 'checkout_android', @@ -244,7 +244,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/error_prone', - 'version': 'hUxlP8GvC1xhmZ6r9xjYau2laPlzHbs_P2emx4ZL4jgC', + 'version': 'ClNqEKjHuNFTgplEe3HujivpADFDjRs0H0ijhyVUg2gC', }, ], 'condition': 'checkout_android', @@ -286,11 +286,11 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git@0fa9014d861f024e28fb491ed7b1cfd44103dee7', + 'https://boringssl.googlesource.com/boringssl.git@9559c4566a6d12194c42db5f3dbbcb5de35cfec2', 'src/third_party/breakpad/breakpad': - 'https://chromium.googlesource.com/breakpad/breakpad.git@6b0c5b7ee1988a14a4af94564e8ae8bba8a94374', + 'https://chromium.googlesource.com/breakpad/breakpad.git@02dd5c3ffbfed2bcbc93b553ed0e90a1ac951cb4', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@44791916611acec1cd74c492c7453e46d9b0dbd2', + 'https://chromium.googlesource.com/catapult.git@4899cc831cb18f58428eca4e2467c40e5f452dee', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, @@ -303,9 +303,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@20b9bdcace7ed561d6a75728c85373503473cb6b', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@8d20c1e0b56c68b14878b597080484f9445962b4', 'src/third_party/ffmpeg': - 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@686d6944501a6ee9c849581e3fe343273d4af3f6', + 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@591ae4b02eaff9a03e2ec863da895128b0b49910', 'src/third_party/flatbuffers/src': 'https://chromium.googlesource.com/external/github.com/google/flatbuffers.git@8db59321d9f02cdffa30126654059c7d02f70c32', 'src/third_party/grpc/src': { @@ -317,11 +317,11 @@ deps = { 'condition': 'checkout_linux', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@f02bffad0fd57f3acfa835c3f2899c5b71ff8be0', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@0ae7e607370cc66218ccfacf5de4db8a35424c2f', 'src/third_party/harfbuzz-ng/src': - 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@1da053e87f0487382404656edca98b85fe51f2fd', + 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@1c249be96e27eafd15eb86d832b67fbc3751634b', 'src/third_party/google_benchmark/src': { - 'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@344117638c8ff7e239044fd0fa7085839fc03021', + 'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@761305ec3b33abf30e08d50eb829e19a802581cc', }, # WebRTC-only dependency (not present in Chromium). 'src/third_party/gtest-parallel': @@ -331,15 +331,15 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/googletest/src': - 'https://chromium.googlesource.com/external/github.com/google/googletest.git@62df7bdbc10887e094661e07ec2595b7920376fd', + 'https://chromium.googlesource.com/external/github.com/google/googletest.git@35d0c365609296fa4730d62057c487e3cfa030ff', 'src/third_party/icu': { - 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@4239b1559d11d4fa66c100543eda4161e060311e', + 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca', }, 'src/third_party/jdk/current': { 'packages': [ { 'package': 'chromium/third_party/jdk', - 'version': 'BXZwbslDFpYhPRuG8hBh2z7ApP36ZG-ZfkBWrkpnPl4C', + 'version': 'U-h0kbYoIUjL__n_sfiudzFLH7-C9vKVsLSOA2XHkBEC', }, ], 'condition': 'host_os == "linux" and checkout_android', @@ -368,7 +368,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/kotlin_stdlib', - 'version': 'XJ7_doI-Qt7GFaSQ9BNo-3qF7Gv2--9Sa8GEUdjxMTUC', + 'version': 'O9XlYa2GU1tlWmQ40OrK2Bekxjt372NtG5pMD-QyNaYC', }, ], 'condition': 'checkout_android', @@ -379,7 +379,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/kotlinc', - 'version': 'FNZSCjJ6yKsi6oRcgQrt-lX0MDlaWoxT7gPTz0CjLhMC', + 'version': 'HckNA1Q54JBiHrpY1gP5qblVCdeuVmGsiGCdv1XjqywC', }, ], 'condition': 'checkout_android', @@ -387,7 +387,7 @@ deps = { }, # Used for building libFuzzers (only supports Linux). 'src/third_party/libFuzzer/src': { - 'url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git@487e79376394754705984c5de7c4ce7f82f2bd7c', + 'url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git@e31b99917861f891308269c36a32363b120126bb', 'condition': 'checkout_linux', }, 'src/third_party/fuzztest/src': @@ -395,23 +395,23 @@ deps = { 'src/third_party/libjpeg_turbo': 'https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@927aabfcd26897abb9776ecf2a6c38ea5bb52ab6', 'src/third_party/libsrtp': - 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@000edd791434c8738455f10e0dd6b268a4852c0b', + 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@a52756acb1c5e133089c798736dd171567df11f5', 'src/third_party/dav1d/libdav1d': - 'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@389450f61ea0b2057fc9ea393d3065859c4ba7f2', + 'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@d242c47b437c950b545e96e7872aa914edc50be5', 'src/third_party/libaom/source/libaom': - 'https://aomedia.googlesource.com/aom.git@840f8797871cc587f7113ea9d2483a1156d57c0e', + 'https://aomedia.googlesource.com/aom.git@ff9badefdf0f98f758ec22fc5bf3816ebdeafd61', 'src/third_party/libunwindstack': { - 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@a3bb4cd02e0e984a235069f812cbef2b37c389e5', + 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@215bddfd8eecb7dd990494854a31b70a96d71b3c', 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@e57316a6ae4e85e9bc8ba82a6c6a93eb5d9a72aa', + 'https://android.googlesource.com/platform/external/perfetto.git@d3990a1c9d27761d8de4290aeadb879a60ecbc90', 'src/third_party/protobuf-javascript/src': Var('chromium_git') + '/external/github.com/protocolbuffers/protobuf-javascript' + '@' + 'e34549db516f8712f678fcd4bc411613b5cc5295', 'src/third_party/libvpx/source/libvpx': - 'https://chromium.googlesource.com/webm/libvpx.git@906334ac1de2b0afa666472dce5545b82c1251fb', + 'https://chromium.googlesource.com/webm/libvpx.git@6f0c446c7b88d384a1c09caf33ec132e7ee24aea', 'src/third_party/libyuv': - 'https://chromium.googlesource.com/libyuv/libyuv.git@a8e59d207483f75b87dd5fc670e937672cdf5776', + 'https://chromium.googlesource.com/libyuv/libyuv.git@307b951229cc2eb756af09ea111f7be6ff065d4f', 'src/third_party/lss': { 'url': 'https://chromium.googlesource.com/linux-syscall-support.git@ce877209e11aa69dcfffbd53ef90ea1d07136521', 'condition': 'checkout_android or checkout_linux', @@ -440,7 +440,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': '-i5fwP_NzM6Ylg5AsSGEotYN7hQgV852gXCslvXIrRwC', + 'version': 'hmRsAQA2HG0DR196Odv3OKZYk-2Ul43tCtzrCyfWpEQC', }, ], 'condition': 'checkout_android', @@ -453,7 +453,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': '3KCj5eRYCvGGYs5i90pRaeihkzsqgUGc4OkICT8AOlIC', + 'version': 'o7pbwAFk68RQBPYLlCUm0mQ6B3Bj9pykXOPvv8akR5kC', }, ], 'condition': 'checkout_android', @@ -464,7 +464,7 @@ deps = { 'condition': 'checkout_android', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@c809c4133185094fbd75508202221ff14fc92f7c', + 'https://chromium.googlesource.com/chromium/src/tools@ae13111c68449033a3e315a28942547231b14b71', 'src/third_party/espresso': { 'packages': [ @@ -503,7 +503,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'k1wif7sS51pJGSFGN7FAeGWDorxgPart9E1f383TQL4C', + 'version': 'w6ABIi35Hbkb4RHJCx4sSWDpt7W9rBvJFkcPVufgZMIC', }, ], 'condition': 'checkout_android and non_git_source', @@ -514,7 +514,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/manifest_merger', - 'version': 'rnIeJMlGw7adxOKZofLsm7tdYaOy1nHivJn9ck7ocVkC', + 'version': 'ltqylfWRbafoft_Pjhfb4NciQwCb3J4PAkpcTZA7lW0C', }, ], 'condition': 'checkout_android', @@ -585,7 +585,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/turbine', - 'version': 'vSia3h9tzpwpP_goLj4HMdl7_FEB5iVCv9nU5ZXOfIMC', + 'version': 'c4onccFJcd8rKHM_6js-X_ucjXdFqhDWK8aUX4ARSkkC', }, ], 'condition': 'checkout_android', @@ -593,7 +593,7 @@ deps = { }, 'src/third_party/zstd/src': { - 'url': Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + '7fb5347e88f10472226c9aa1962a148e55d8c480', + 'url': Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + 'b0a179d469680276adbd4007435989a6b7fd8b4f', 'condition': 'checkout_android', }, @@ -715,7 +715,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', - 'version': 'version:2@20.1.0.cr1', + 'version': 'version:2@21.1.1.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -726,7 +726,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', - 'version': 'version:2@18.0.1.cr1', + 'version': 'version:2@18.0.2.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -737,7 +737,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', - 'version': 'version:2@18.0.2.cr1', + 'version': 'version:2@18.0.10.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_blockstore': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_blockstore', + 'version': 'version:2@16.4.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -810,6 +821,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_fido': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido', + 'version': 'version:2@21.1.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_flags': { 'packages': [ { @@ -931,6 +953,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/cipd/libs/com_google_android_libraries_identity_googleid_googleid': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_libraries_identity_googleid_googleid', + 'version': 'version:2@1.1.1.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/cipd/libs/com_google_android_material_material': { 'packages': [ { @@ -1276,7 +1309,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_okio_okio_jvm', - 'version': 'version:2@3.9.0.cr1', + 'version': 'version:2@3.9.1.cr1', }, ], 'condition': 'checkout_android and non_git_source', diff --git a/tools_webrtc/get_landmines.py b/tools_webrtc/get_landmines.py index c135af6365..7d5f600a8b 100755 --- a/tools_webrtc/get_landmines.py +++ b/tools_webrtc/get_landmines.py @@ -67,6 +67,8 @@ def print_landmines(): # pylint: disable=invalid-name print('Clobber to remove .xctest files.') print('Clobber to remove .xctest files (take 2).') print('Switching rtc_executable to rtc_test') + if host_os() == 'android': + print('Clobber due to Android "compile confirm no-op" errors.') def main():