From 6bbe1a47e16e747f376cc139089d465f124d43c8 Mon Sep 17 00:00:00 2001 From: chromium-webrtc-autoroll Date: Mon, 14 Jun 2021 11:02:57 -0700 Subject: [PATCH] Roll chromium_revision e9261a56ad..570a173256 (892013:892156) Change log: https://chromium.googlesource.com/chromium/src/+log/e9261a56ad..570a173256 Full diff: https://chromium.googlesource.com/chromium/src/+/e9261a56ad..570a173256 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/54fedec3aa..5861d7d03a * src/build: https://chromium.googlesource.com/chromium/src/build/+log/b59724c60a..40d08dfe70 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/9bf9e6fb50..fb190fe345 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/3c85e0a05c..d4bd8dddb7 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/9c4fcf3744..02b80969a2 * src/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine: version:2@2.8.0.cr0..version:2@2.8.8.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation: version:2@2.4.0.cr0..version:2@2.7.1.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations: version:2@2.4.0.cr0..version:2@2.7.1.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api: version:2@2.4.0.cr0..version:2@2.7.1.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_core: version:2@2.4.0.cr0..version:2@2.7.1.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations: version:2@2.4.0.cr0..version:2@2.7.1.cr0 * src/third_party/android_deps/libs/org_checkerframework_checker_qual: version:2@3.5.0.cr0..version:2@3.8.0.cr0 * src/third_party/android_deps/libs/org_checkerframework_dataflow_shaded: version:2@3.1.2.cr0..version:2@3.11.0.cr0 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/2f46970950..2a1d8a231a * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/7833e308ef..8336d53cff * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/9834c0b426..8d191d6395 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/24587d48b2..73b2a35554 Added dependencies * src/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils * src/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit Removed dependency * src/third_party/android_deps/libs/org_threeten_threeten_extra DEPS diff: https://chromium.googlesource.com/chromium/src/+/e9261a56ad..570a173256/DEPS No update to Clang. TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com, BUG=None Change-Id: I2db347965d73349821552d28a13c24282c69b2bc Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/222421 Reviewed-by: Autoroller Commit-Queue: Autoroller Cr-Commit-Position: refs/heads/master@{#34286} --- DEPS | 69 +++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/DEPS b/DEPS index 1fff998ed7..01e382cb2b 100644 --- a/DEPS +++ b/DEPS @@ -7,16 +7,16 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': 'e9261a56ada7f4cd16a9817aadd494055f256e87', + 'chromium_revision': '570a173256905506ef3c28e3aeae4d899e5d38de', } deps = { # 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@54fedec3aa09220ae7364e07c208af3a2ab883e4', + 'https://chromium.googlesource.com/chromium/src/base@5861d7d03a98e6dd10d7473ad1b76f6f28c8ea36', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@b59724c60a825c0d0ab45b4577ded0af93d3f771', + 'https://chromium.googlesource.com/chromium/src/build@40d08dfe703ea804190d232a94cb3eee87f7156a', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@be7dcbc36110b9381f228b8e4ca73ca1db9bf21a', # Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC. @@ -25,13 +25,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@9bf9e6fb5031d3f00687fd45d51ca87c425b7cbd', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@fb190fe345d65cfb1ffd47668f77c0c94de39139', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@3c85e0a05c94eeb75e00fae37e2aded522310a72', + 'https://chromium.googlesource.com/chromium/src/testing@d4bd8dddb7dc56b209cd97ed7031456df1255151', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@9c4fcf374451c86a8e8b9bd7341d405c690a4627', + 'https://chromium.googlesource.com/chromium/src/third_party@02b80969a2d6d140532ba1d8cda673e8c1dd0597', 'src/buildtools/linux64': { 'packages': [ @@ -122,7 +122,7 @@ deps = { 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@c484031f1f199ee53567241426efffee49008f82', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@2f46970950767a342195669166fc8768e9f24b1d', + 'https://chromium.googlesource.com/catapult.git@2a1d8a231ab8b12a50ee0b0272cf40d123cb3886', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, @@ -144,7 +144,7 @@ deps = { 'condition': 'checkout_linux', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@7833e308efec8caf5ce62855e9b27041ad2155ad', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@8336d53cff9f78bb48f1ba4aa670c1d8d81d1808', 'src/third_party/harfbuzz-ng/src': 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@4811e8f5d76ef528b4cec00f241cc4ab8110db30', 'src/third_party/google_benchmark/src': { @@ -208,7 +208,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@9834c0b42685d73191ef86d127f4e283d8cb6277', + 'https://android.googlesource.com/platform/external/perfetto.git@8d191d6395c49babd37720c1b258207927346419', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@61edec1efbea1c02d71857e2aff9426d9cd2df4e', 'src/third_party/libyuv': @@ -265,7 +265,7 @@ deps = { 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@24587d48b223a49c3f83a31cf721dc95911ff105', + 'https://chromium.googlesource.com/chromium/src/tools@73b2a35554cf03cc961c6a6e49726b70798ad6d0', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@a32a1607f6093d338f756c7e7c7b4333b0c50c9c', @@ -1001,7 +1001,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine', - 'version': 'version:2@2.8.0.cr0', + 'version': 'version:2@2.8.8.cr0', }, ], 'condition': 'checkout_android', @@ -1397,7 +1397,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation', - 'version': 'version:2@2.4.0.cr0', + 'version': 'version:2@2.7.1.cr0', }, ], 'condition': 'checkout_android', @@ -1408,7 +1408,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', - 'version': 'version:2@2.4.0.cr0', + 'version': 'version:2@2.7.1.cr0', }, ], 'condition': 'checkout_android', @@ -1419,7 +1419,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api', - 'version': 'version:2@2.4.0.cr0', + 'version': 'version:2@2.7.1.cr0', }, ], 'condition': 'checkout_android', @@ -1430,7 +1430,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core', - 'version': 'version:2@2.4.0.cr0', + 'version': 'version:2@2.7.1.cr0', }, ], 'condition': 'checkout_android', @@ -1441,7 +1441,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations', - 'version': 'version:2@2.4.0.cr0', + 'version': 'version:2@2.7.1.cr0', }, ], 'condition': 'checkout_android', @@ -1712,6 +1712,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils', + 'version': 'version:2@4.0.cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/javax_annotation_javax_annotation_api': { 'packages': [ { @@ -1991,7 +2002,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', - 'version': 'version:2@3.5.0.cr0', + 'version': 'version:2@3.8.0.cr0', }, ], 'condition': 'checkout_android', @@ -2002,7 +2013,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_shaded', - 'version': 'version:2@3.1.2.cr0', + 'version': 'version:2@3.11.0.cr0', }, ], 'condition': 'checkout_android', @@ -2053,6 +2064,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit', + 'version': 'version:2@4.4.1.201607150455-r.cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/org_jetbrains_annotations': { 'packages': [ { @@ -2317,17 +2339,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_threeten_threeten_extra': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_threeten_threeten_extra', - 'version': 'version:2@1.5.0.cr0', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - # === ANDROID_DEPS Generated Code End === }