From f1aa9fbb097a1c22de177246f24c1082df40d4e5 Mon Sep 17 00:00:00 2001 From: chromium-webrtc-autoroll Date: Wed, 7 Dec 2022 04:51:42 -0800 Subject: [PATCH] Roll chromium_revision 6d86775bf1..13440ad881 (1076834:1080293) Change log: https://chromium.googlesource.com/chromium/src/+log/6d86775bf1..13440ad881 Full diff: https://chromium.googlesource.com/chromium/src/+/6d86775bf1..13440ad881 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/e89ad07314..b6b2f94893 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/198be41ce3..73b80fa285 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/f2fe6dda1e..71c674dc56 * src/buildtools/third_party/libc++/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/c2e10323cc..a9779c11d2 * src/buildtools/third_party/libc++abi/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/9231726c61..f46bba92c0 * src/buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/fd49ee4ee9..fd5b3b5068 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/0eee1cdab5..7e6d74ba10 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/4e41634fa2..4d0bc6a224 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/ff621271b0..ea81a1d159 * src/third_party/android_build_tools/aapt2: -QrdsGmvVhHeoRc5wKCnU2LXEjk1s0ocheitXWf5dhYC..cbNG7g8Sinh-lsT8hWsU-RyXqLT_uh4jIb1fjCdhrzIC * src/third_party/android_build_tools/manifest_merger: 1_tPfyswsXgfbNegip6nTy55E2ASlhsRqA2sKhUo01YC..X4l8RIBEAF108FpSEWRF7UHqq-kY8T3ibSsObGU5u3UC * src/third_party/androidx: YqHXeju2kOGh8x26xULaEyiL6jpRD-vslKaU7czLvKwC..OsLJqVdZEwRSmYkbx3YR-AlSoa8_tTlhUa4E0p3O0ykC * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/2fd8de6534..28f96c2686 * src/third_party/breakpad/breakpad: https://chromium.googlesource.com/breakpad/breakpad.git/+log/442456a68c..87b60390f0 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/41982a4a32..11955a66e9 * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/67828ff1bb..a2658217d2 * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/fd5b30c4bc..a249b21db6 * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/aca4ec5907..34c1bb66e4 * src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/d7fc49b8b6..bee1caded2 * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/600d527068..d581ead87c * src/third_party/r8: RM1MB7AK90GPkspZ5TLRVyJNIC0JB4sz1rWL9JLLdNkC..smgiQDhBHEfz8KVdqBXas7z0ALaukjW3Yh-JVGPsFksC * src/third_party/turbine: 4Cvss-AYlYPcW_PIdcX45Ew7ZQwsaeurs7mUjS3LFyQC..R-Qp1tMBqIuETMfXNqQU9GB00ij6dsPjVmjDuvH_194C * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/9353893e0e..cf3756fe71 * src/tools/luci-go: git_revision:7a04ca7c0fd3e73cc09c817542a74d947e68b8c9..git_revision:bac571b5399502fa16ac48a1d3820e1117505085 * src/tools/luci-go: git_revision:7a04ca7c0fd3e73cc09c817542a74d947e68b8c9..git_revision:bac571b5399502fa16ac48a1d3820e1117505085 Removed dependencies * src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs * src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration DEPS diff: https://chromium.googlesource.com/chromium/src/+/6d86775bf1..13440ad881/DEPS Clang version changed llvmorg-16-init-10736-ged9638c4:llvmorg-16-init-12251-g87d0ff91 Details: https://chromium.googlesource.com/chromium/src/+/6d86775bf1..13440ad881/tools/clang/scripts/update.py BUG=None Change-Id: Icdf544f4695bae1478a7959715f63e462d6f3065 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/286820 Commit-Queue: Autoroller Bot-Commit: Autoroller Cr-Commit-Position: refs/heads/main@{#38837} --- DEPS | 74 +++++++++++++++++++++--------------------------------------- 1 file changed, 26 insertions(+), 48 deletions(-) diff --git a/DEPS b/DEPS index cca68d5976..339a2af545 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': '6d86775bf1e3e05643c466f07d3818ae81466afa', + 'chromium_revision': '13440ad881208d84f94021a8f8c80958f4d42433', # Keep the Chromium default of generating location tags. 'generate_location_tags': True, @@ -41,24 +41,24 @@ vars = { deps = { # TODO(kjellander): Move this to be Android-only. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@e89ad073148d6fa9c399bfa44c28eb5eac6b54f6', + 'https://chromium.googlesource.com/chromium/src/base@b6b2f948932bde8063327fbc20434f94dc0c0bf6', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@198be41ce351b8d59accf5fabf5f7a35b9906c3e', + 'https://chromium.googlesource.com/chromium/src/build@73b80fa2853bdd9ba5883f0136679bc8ae42afeb', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@f2fe6dda1e9dabb6cfc304938161569074f1e188', + 'https://chromium.googlesource.com/chromium/src/buildtools@71c674dc561fb67f41b21c026a87d16a28745047', # 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@0eee1cdab5d59a5f43eca3e9590517929cf0a0cb', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@7e6d74ba103fbe36e5a3aeb2a5215cc3b6083bb1', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@4e41634fa278ac9684912962c8072d9cd6578831', + 'https://chromium.googlesource.com/chromium/src/testing@4d0bc6a2242c9659aa8bbce61d070db2c355b625', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@ff621271b041cde8a3760ccc64adee3bae58eca5', + 'https://chromium.googlesource.com/chromium/src/third_party@ea81a1d159f9615ba0e2a752ecc614af1e483ea0', 'src/buildtools/linux64': { 'packages': [ @@ -103,11 +103,11 @@ deps = { 'src/buildtools/clang_format/script': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@8b525d2747f2584fc35d8c7e612e66f377858df7', 'src/buildtools/third_party/libc++/trunk': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@c2e10323cc8190175715ea1bcdb109f59b84447c', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@a9779c11d2349375be0c29f7c42d9c42633297b5', 'src/buildtools/third_party/libc++abi/trunk': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@9231726c61a0c2d3e1ef8be1553f51b1222979a7', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@f46bba92c0a967f8c538f0763f9167a3ee4d06f5', 'src/buildtools/third_party/libunwind/trunk': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@fd49ee4ee904ff6b65fc76ba2448a370873255e3', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@fd5b3b5068cce90dd7c07964cd8cdce2695088e9', 'src/third_party/ninja': { 'packages': [ @@ -143,7 +143,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/aapt2', - 'version': '-QrdsGmvVhHeoRc5wKCnU2LXEjk1s0ocheitXWf5dhYC', + 'version': 'cbNG7g8Sinh-lsT8hWsU-RyXqLT_uh4jIb1fjCdhrzIC', }, ], 'condition': 'checkout_android', @@ -162,11 +162,11 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git@2fd8de65347cebe9870b872e528658b922f61fe3', + 'https://boringssl.googlesource.com/boringssl.git@28f96c2686459add7acedcd97cb841030bdda019', 'src/third_party/breakpad/breakpad': - 'https://chromium.googlesource.com/breakpad/breakpad.git@442456a68cafc9325ef9e6f5bae8f425241ddaab', + 'https://chromium.googlesource.com/breakpad/breakpad.git@87b60390f05bc91a13d0c636f7ce75fa2f7533ca', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@41982a4a329f4a619248bb9c1bdad0bf3f599398', + 'https://chromium.googlesource.com/catapult.git@11955a66e9c8d103b91e05a2f49ad7ad222e5c94', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, @@ -175,9 +175,9 @@ deps = { 'src/third_party/crc32c/src': 'https://chromium.googlesource.com/external/github.com/google/crc32c.git@fa5ade41ee480003d9c5af6f43567ba22e4e17e6', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@67828ff1bb688f19ea114e5aa1de812da863c4da', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@a2658217d239ddbe572c277cfa959275736a29f2', 'src/third_party/ffmpeg': - 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@fd5b30c4bcf95ee607caf47ef65c3b96210867a4', + 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@a249b21db6516234e5456716ae074fbb00176b3f', 'src/third_party/flatbuffers/src': 'https://chromium.googlesource.com/external/github.com/google/flatbuffers.git@e3017029647a88eb6f509ee9744012fffeb0d371', 'src/third_party/grpc/src': { @@ -189,7 +189,7 @@ deps = { 'condition': 'checkout_linux', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@aca4ec5907e0bfb5bbeb01370257a121f3f47a0f', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@34c1bb66e483f66c1f15d5379d3b2133b7b20c4f', 'src/third_party/harfbuzz-ng/src': 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@2822b589bc837fae6f66233e2cf2eef0f6ce8470', 'src/third_party/google_benchmark/src': { @@ -239,13 +239,13 @@ deps = { 'src/third_party/dav1d/libdav1d': 'https://chromium.googlesource.com/external/github.com/videolan/dav1d.git@87f9a81cd770e49394a45deca7a3df41243de00b', 'src/third_party/libaom/source/libaom': - 'https://aomedia.googlesource.com/aom.git@d7fc49b8b6b5663ec93b6850839e3451e3dd0339', + 'https://aomedia.googlesource.com/aom.git@bee1caded272127a6d6b70ac79479083d183d5d0', 'src/third_party/libunwindstack': { 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@4dbfa0e8c844c8e243b297bc185e54a99ff94f9e', 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@600d5270680543bc0657c1371f741547604fea86', + 'https://android.googlesource.com/platform/external/perfetto.git@d581ead87c2d31ce661f55d24104b41269cf98e4', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@605350bd5b68ac47f595d60cc8ef346588e773c0', 'src/third_party/libyuv': @@ -270,7 +270,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'RM1MB7AK90GPkspZ5TLRVyJNIC0JB4sz1rWL9JLLdNkC', + 'version': 'smgiQDhBHEfz8KVdqBXas7z0ALaukjW3Yh-JVGPsFksC', }, ], 'condition': 'checkout_android', @@ -294,7 +294,7 @@ deps = { 'condition': 'checkout_android', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@9353893e0eb539d3bb2462243b15bd604387dca6', + 'https://chromium.googlesource.com/chromium/src/tools@cf3756fe71dbf67dcefcce4ea64d7566c4e110ec', 'src/third_party/accessibility_test_framework': { 'packages': [ @@ -371,7 +371,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'YqHXeju2kOGh8x26xULaEyiL6jpRD-vslKaU7czLvKwC', + 'version': 'OsLJqVdZEwRSmYkbx3YR-AlSoa8_tTlhUa4E0p3O0ykC', }, ], 'condition': 'checkout_android', @@ -382,7 +382,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/manifest_merger', - 'version': '1_tPfyswsXgfbNegip6nTy55E2ASlhsRqA2sKhUo01YC', + 'version': 'X4l8RIBEAF108FpSEWRF7UHqq-kY8T3ibSsObGU5u3UC', }, ], 'condition': 'checkout_android', @@ -472,7 +472,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/turbine', - 'version': '4Cvss-AYlYPcW_PIdcX45Ew7ZQwsaeurs7mUjS3LFyQC', + 'version': 'R-Qp1tMBqIuETMfXNqQU9GB00ij6dsPjVmjDuvH_194C', }, ], 'condition': 'checkout_android', @@ -483,11 +483,11 @@ deps = { 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', - 'version': 'git_revision:7a04ca7c0fd3e73cc09c817542a74d947e68b8c9', + 'version': 'git_revision:bac571b5399502fa16ac48a1d3820e1117505085', }, { 'package': 'infra/tools/luci/swarming/${{platform}}', - 'version': 'git_revision:7a04ca7c0fd3e73cc09c817542a74d947e68b8c9', + 'version': 'git_revision:bac571b5399502fa16ac48a1d3820e1117505085', }, ], 'dep_type': 'cipd', @@ -940,28 +940,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs', - 'version': 'version:2@1.1.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration', - 'version': 'version:2@1.1.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api': { 'packages': [ {