Roll chromium_revision 47fab10a5d..b4562c8dc8 (974582:974583)
The third_party/android_deps/libs/org_robolectric_shadows_multidex dependency had to be moved manually.
Change log: https://chromium.googlesource.com/chromium/src/+log/47fab10a5d..b4562c8dc8
Full diff: https://chromium.googlesource.com/chromium/src/+/47fab10a5d..b4562c8dc8
Changed dependencies
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/1ccd6b651d..187616c5fc
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/e3b729952d..bcfb6fca6d
* src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/93c15529c3..893aa038dd
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/469142ebf2..4eaa194b8b
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/bede1d9398..629e78f5b3
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/0c497a1ac6..d2f57fb779
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/8f3c4ef866..08a8050c47
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/306b03b191..2c668c866d
* src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/bcdfa38692..034e5dbf92
* src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/b867f209e4..901474b180
* src/third_party/robolectric: Kdd6dNFAKqj9g9Bsfo2z1zQr52Vk60EL_wb9Bf2c8rcC..FihBToFLI9o7fW09ZtQ_5YruQy6sDWMo1Pv0g97eAxEC
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/01862032d8..bc929d3e94
DEPS diff: https://chromium.googlesource.com/chromium/src/+/47fab10a5d..b4562c8dc8/DEPS
No update to Clang.
BUG=chromium:1184780
Change-Id: If302a3bec96f4b94d320d611e6cdb163305c591e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/252420
Auto-Submit: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36065}
diff --git a/DEPS b/DEPS
index bd0073f..12fda9d 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': '0b2f63dc4b44dd325cbd0ef09553b411f2ecf71d',
+ 'chromium_revision': 'b4562c8dc867d02eac53a1cacfa8c01dcce85ec4',
# Keep the Chromium default of generating location tags.
'generate_location_tags': True,
@@ -23,24 +23,24 @@
# 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@1ccd6b651d26656f0640bfd1f92ac6a7bc0ed050',
+ 'https://chromium.googlesource.com/chromium/src/base@187616c5fc42d8f190b3931eacffb7223e83f262',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@e3b729952de607b9f3d522053dc657a2f0d2b7fb',
+ 'https://chromium.googlesource.com/chromium/src/build@bcfb6fca6d9c1747faa96854e0e124deef6b458b',
'src/buildtools':
- 'https://chromium.googlesource.com/chromium/src/buildtools@93c15529c323c6cc12516ef9caac7fd815ee7c82',
+ 'https://chromium.googlesource.com/chromium/src/buildtools@893aa038dd17d05f3c5ff5af98daebabc294a948',
# 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@469142ebf2d30e46538330cba8734971e11ea520',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@4eaa194b8b3c40af0f810417816f02bac7269b81',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@bede1d93986afb8ca46431bb50b6b2ec2a461d2a',
+ 'https://chromium.googlesource.com/chromium/src/testing@629e78f5b3d5bf879409c9624095078d312be446',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@0c497a1ac6f7a99ffca2095023fee71bf12183c8',
+ 'https://chromium.googlesource.com/chromium/src/third_party@d2f57fb7795d3a9a59d98d3ce82898af35fbca75',
'src/buildtools/linux64': {
'packages': [
@@ -140,7 +140,7 @@
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@08bd844599bf04c71707e8f59a8013a941264695',
'src/third_party/catapult':
- 'https://chromium.googlesource.com/catapult.git@8f3c4ef86630d09ba69e3e6dd35553791cfa6b1e',
+ 'https://chromium.googlesource.com/catapult.git@08a8050c47dc376c85ba2bda2ec4db2e1f7ea961',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
@@ -149,7 +149,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@306b03b1912affcae0dbecbe5aa36b414fb4ae2a',
+ 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@2c668c866d8678edbff7d10f99c03e82140242ec',
'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@574c39cce3231c69bc9a02ac475c27d944bdb113',
'src/third_party/findbugs': {
@@ -162,7 +162,7 @@
'condition': 'checkout_linux',
},
'src/third_party/freetype/src':
- 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@bcdfa38692d590dda5bc9e4334842abe92ec0ba5',
+ 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@034e5dbf92ea3a7ea7c9322e47a3a50ff23f7b55',
'src/third_party/harfbuzz-ng/src':
'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@0acf466c44143de2e9b9cc0375cb25ec67cb132f',
'src/third_party/google_benchmark/src': {
@@ -184,7 +184,7 @@
'src/third_party/googletest/src':
'https://chromium.googlesource.com/external/github.com/google/googletest.git@c9461a9b55ba954df0489bab6420eb297bed846b',
'src/third_party/icu': {
- 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@b867f209e4b56b0a8c01aaaba3882ad41e438c4f',
+ 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@901474b1806d6b5a068606006dbb4c08e9974353',
},
'src/third_party/jdk': {
'packages': [
@@ -285,7 +285,7 @@
'condition': 'checkout_win',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@01862032d809eff27a0b83832d8b79b943005c2c',
+ 'https://chromium.googlesource.com/chromium/src/tools@bc929d3e944c8dbe7d849a1de5aeb0141cd7fabc',
'src/third_party/accessibility_test_framework': {
'packages': [
@@ -456,7 +456,7 @@
'packages': [
{
'package': 'chromium/third_party/robolectric',
- 'version': 'Kdd6dNFAKqj9g9Bsfo2z1zQr52Vk60EL_wb9Bf2c8rcC',
+ 'version': 'FihBToFLI9o7fW09ZtQ_5YruQy6sDWMo1Pv0g97eAxEC',
},
],
'condition': 'checkout_android',
@@ -499,20 +499,6 @@
'dep_type': 'cipd',
},
- # TODO(crbug.com/1184780) Move this back to ANDROID_DEPS Generated Code
- # section once org_robolectric_shadows_multidex is updated to a new version
- # that does not need jetify.
- 'src/third_party/android_deps/libs/org_robolectric_shadows_multidex': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_multidex',
- 'version': 'version:4.3.1-cr1',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
# Everything coming after this is automatically updated by the auto-roller.
# === ANDROID_DEPS Generated Code Start ===
# Generated by //third_party/android_deps/fetch_all.py
@@ -604,28 +590,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent',
- 'version': 'version:2@3.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/classworlds_classworlds': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/classworlds_classworlds',
- 'version': 'version:2@1.1-alpha-2.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/libs/com_android_support_animated_vector_drawable': {
'packages': [
{
@@ -1334,7 +1298,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations',
- 'version': 'version:2@1.7.cr0',
+ 'version': 'version:2@1.7.4.cr0',
},
],
'condition': 'checkout_android',
@@ -1792,28 +1756,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/nekohtml_nekohtml': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/nekohtml_nekohtml',
- 'version': 'version:2@1.9.6.2.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/nekohtml_xercesminimal': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/nekohtml_xercesminimal',
- 'version': 'version:2@1.9.6.2.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/libs/net_ltgt_gradle_incap_incap': {
'packages': [
{
@@ -1836,182 +1778,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/org_apache_ant_ant': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant',
- 'version': 'version:2@1.8.0.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_ant_ant_launcher': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant_launcher',
- 'version': 'version:2@1.8.0.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_ant_tasks': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_ant_tasks',
- 'version': 'version:2@2.1.3.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_artifact': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_artifact',
- 'version': 'version:2@2.2.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_artifact_manager': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_artifact_manager',
- 'version': 'version:2@2.2.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics',
- 'version': 'version:2@2.2.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_model': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_model',
- 'version': 'version:2@2.2.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_plugin_registry': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_plugin_registry',
- 'version': 'version:2@2.2.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_profile': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_profile',
- 'version': 'version:2@2.2.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_project': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_project',
- 'version': 'version:2@2.2.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_repository_metadata': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_repository_metadata',
- 'version': 'version:2@2.2.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_maven_settings': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_settings',
- 'version': 'version:2@2.2.1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_file': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_file',
- 'version': 'version:2@1.0-beta-6.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_lightweight': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_lightweight',
- 'version': 'version:2@1.0-beta-6.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_shared': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_shared',
- 'version': 'version:2@1.0-beta-6.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_provider_api': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_provider_api',
- 'version': 'version:2@1.0-beta-6.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup': {
'packages': [
{
@@ -2067,39 +1833,6 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default',
- 'version': 'version:2@1.0-alpha-9-stable-1.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation',
- 'version': 'version:2@1.11.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils',
- 'version': 'version:2@1.5.15.cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
'src/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit': {
'packages': [
{
@@ -2203,7 +1936,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm',
- 'version': 'version:2@7.0.cr0',
+ 'version': 'version:2@9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2214,7 +1947,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis',
- 'version': 'version:2@7.0.cr0',
+ 'version': 'version:2@9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2225,7 +1958,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons',
- 'version': 'version:2@7.0.cr0',
+ 'version': 'version:2@9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2236,7 +1969,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree',
- 'version': 'version:2@7.0.cr0',
+ 'version': 'version:2@9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2247,7 +1980,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util',
- 'version': 'version:2@7.0.cr0',
+ 'version': 'version:2@9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2269,7 +2002,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2280,7 +2013,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2291,7 +2024,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2302,7 +2035,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2313,7 +2046,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2324,7 +2057,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2335,7 +2068,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2346,7 +2079,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2357,7 +2090,18 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/org_robolectric_shadows_multidex': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_multidex',
+ 'version': 'version:2@4.6.1.cr1',
},
],
'condition': 'checkout_android',
@@ -2368,7 +2112,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_playservices',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2379,7 +2123,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2390,7 +2134,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector',
- 'version': 'version:2@4.3.1.cr0',
+ 'version': 'version:2@4.6.1.cr0',
},
],
'condition': 'checkout_android',
