Roll chromium_revision af7a4783c1..60cf2ce5ba (1230849:1231287)
Add third_party/aosp_dalvik to DEPS. This adds about 900KB to the checkout size.
Change log: https://chromium.googlesource.com/chromium/src/+log/af7a4783c1..60cf2ce5ba
Full diff: https://chromium.googlesource.com/chromium/src/+/af7a4783c1..60cf2ce5ba
Changed dependencies
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/72b2d379e5..f0b935140f
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/f9cc71c99c..bb826aaf00
* src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/c65da25aed..b17c7e870e
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/5d162c569f..f85ff5cfa7
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/7545344f1c..189d923e10
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/2253e32489..c35e8a3c66
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/d9aa189385..ee967548fe
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/9e5fc28b6b..b5393e57bb
* src/third_party/libc++/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/6cd38f6d30..0ad014cff4
* src/third_party/libc++abi/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/c21fd3819a..4cb5c2cefe
* src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/9142314c2c..741b8f6228
* src/third_party/r8: 1cleC9ETmNTNjX-TQoPj14Siz7FFAy6HR6x5pbSS00oC..wtFJRWzGTig_UR3UW82YW63l-sTznrAPEatq-o7zNqYC
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/82be8016c4..bcc6c5bc98
DEPS diff: https://chromium.googlesource.com/chromium/src/+/af7a4783c1..60cf2ce5ba/DEPS
Clang version changed llvmorg-18-init-12422-g74cdb8e6:llvmorg-18-init-12938-geb1d5065
Details: https://chromium.googlesource.com/chromium/src/+/af7a4783c1..60cf2ce5ba/tools/clang/scripts/update.py
BUG=None
Change-Id: I1c5c6dd84174f1a52d543d5a62e6b385615b7bd0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/329320
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41297}
diff --git a/DEPS b/DEPS
index fc42833..0f25b04 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': 'af7a4783c123e4c503a276edfc0a8d5514f13294',
+ 'chromium_revision': '60cf2ce5ba3417695d02754c90bd919eb438e4b5',
# Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to
# process the raw profiles produced by instrumented targets (built with
@@ -50,24 +50,24 @@
deps = {
# TODO(kjellander): Move this to be Android-only.
'src/base':
- 'https://chromium.googlesource.com/chromium/src/base@72b2d379e5e657ac8732fc177e03751ea8a0fcd2',
+ 'https://chromium.googlesource.com/chromium/src/base@f0b935140fa4d6c206b3419056f8e647ec7e6583',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@f9cc71c99c2fc565a9d833f8ad85c0cb05346265',
+ 'https://chromium.googlesource.com/chromium/src/build@bb826aaf00833bb61244a7ab5c4ca8c69c51314a',
'src/buildtools':
- 'https://chromium.googlesource.com/chromium/src/buildtools@c65da25aed99c711ef83d26343733f1a70e5ad1b',
+ 'https://chromium.googlesource.com/chromium/src/buildtools@b17c7e870e1d722d81f59738707392accf633011',
# 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@5d162c569f0347f7135e075e233e2a25f35b4398',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@f85ff5cfa70484822ca7181012597114ae7ad125',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@7545344f1c62d0a01dbce93049bf44d2b4dea27a',
+ 'https://chromium.googlesource.com/chromium/src/testing@189d923e10bfcb856eff08164d6140f93938d854',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@2253e324895a3774facf69da11f5ca51ec51ce26',
+ 'https://chromium.googlesource.com/chromium/src/third_party@c35e8a3c66aaeb31689af01f6ef63509504b68ff',
'src/buildtools/linux64': {
'packages': [
@@ -115,9 +115,9 @@
'src/third_party/clang-format/script':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@e5337933f2951cacd3aeacd238ce4578163ca0b9',
'src/third_party/libc++/src':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@6cd38f6d30dda7bed3df08427db0b2a4e3fa9e47',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@0ad014cff4509d293e62d1d8c7ffd080bcb2f2d6',
'src/third_party/libc++abi/src':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@c21fd3819a09fb151561b738ce1e4fdb6dbf3627',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@4cb5c2cefedc025433f81735bacbc0f773fdcd8f',
'src/third_party/libunwind/src':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@bbe2764382995e4ec9a8c26c50018afc9520ea4f',
@@ -173,12 +173,23 @@
'dep_type': 'cipd',
},
+ 'src/third_party/aosp_dalvik': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/aosp_dalvik/linux-amd64',
+ 'version': 'version:2@13.0.0_r24.cr1',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
'src/third_party/boringssl/src':
'https://boringssl.googlesource.com/boringssl.git@1b7fdbd9101dedc3e0aa3fcf4ff74eacddb34ecc',
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@f49c2f1a2023da0cb055874fba050563dfea57db',
'src/third_party/catapult':
- 'https://chromium.googlesource.com/catapult.git@d9aa189385c2a4ec17be2f88291a6cd826ca62fd',
+ 'https://chromium.googlesource.com/catapult.git@ee967548fe6a699fc295d81bd05c8116bcaf5e7e',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
@@ -191,7 +202,7 @@
'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@9e5fc28b6b27ad4ffb4c3ddc66388e53e4f0f5b0',
+ 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@b5393e57bb81eb1b6fbecbd7f466abcb61d278b4',
'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@866768f35c2226f4c805844207fd11c049ebe962',
'src/third_party/flatbuffers/src':
@@ -293,7 +304,7 @@
'src/third_party/perfetto':
'https://android.googlesource.com/platform/external/perfetto.git@d8a8260e8a08b166547eecd5b6ffcbdb30421109',
'src/third_party/libvpx/source/libvpx':
- 'https://chromium.googlesource.com/webm/libvpx.git@9142314c2cec2be364e6844d1630a056e7b0a3c8',
+ 'https://chromium.googlesource.com/webm/libvpx.git@741b8f6228984e888c99849d7675ea4132eaf268',
'src/third_party/libyuv':
'https://chromium.googlesource.com/libyuv/libyuv.git@04821d1e7d60845525e8db55c7bcd41ef5be9406',
'src/third_party/lss': {
@@ -320,7 +331,7 @@
'packages': [
{
'package': 'chromium/third_party/r8',
- 'version': '1cleC9ETmNTNjX-TQoPj14Siz7FFAy6HR6x5pbSS00oC',
+ 'version': 'wtFJRWzGTig_UR3UW82YW63l-sTznrAPEatq-o7zNqYC',
},
],
'condition': 'checkout_android',
@@ -344,7 +355,7 @@
'condition': 'checkout_android',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@82be8016c423d0a5247b4e6dc15ce7e8a1fe613c',
+ 'https://chromium.googlesource.com/chromium/src/tools@bcc6c5bc9871bcf8842e6a42397939235fa04860',
'src/third_party/accessibility_test_framework': {
'packages': [
@@ -357,28 +368,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/byte_buddy': {
- 'packages': [
- {
- 'package': 'chromium/third_party/byte_buddy',
- 'version': 'c9b53316603fc2d997c899c7ca1707f809b918cd',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/byte_buddy/android_sdk_build_tools_25_0_2': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_sdk/public/build-tools',
- 'version': 'kwIs2vdfTm93yEP8LG5aSnchN4BVEdVxbqQtF4XpPdkC',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
'src/third_party/espresso': {
'packages': [
{
