From 14b0e73bd841cce00c5868eef1326f952ea48e3c Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Wed, 27 Jan 2021 09:16:07 +0100 Subject: [PATCH] Roll chromium_revision e3ed290da5..61b8ff5c89 (846763:847529) Change log: https://chromium.googlesource.com/chromium/src/+log/e3ed290da5..61b8ff5c89 Full diff: https://chromium.googlesource.com/chromium/src/+/e3ed290da5..61b8ff5c89 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/5397c2600c..acfa7a9bdd * src/build: https://chromium.googlesource.com/chromium/src/build/+log/4ba9b31907..fcaf1b1b36 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/13547b97da..e3db55b463 * src/buildtools/clang_format/script: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git/+log/23f18eb6f7..99803d74e3 * src/buildtools/linux64: git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e..git_revision:55ad154c961d8326315b1c8147f4e504cd95e9e6 * src/buildtools/mac: git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e..git_revision:55ad154c961d8326315b1c8147f4e504cd95e9e6 * src/buildtools/win: git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e..git_revision:55ad154c961d8326315b1c8147f4e504cd95e9e6 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/8790968c74..77fffc677e * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/01cab16640..001e33eea6 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/cc28b65885..e9e90a85fa * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/957dfeae29..1cd5ea42ac * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/f08e425f2d..fade894c7e * src/third_party/libjpeg_turbo: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git/+log/518d81558c..fa0de07678 * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/122834484a..17fea3e29e * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/262a9440ba..f4260d3a54 Added dependencies * src/third_party/android_deps/libs/com_google_firebase_firebase_messaging * src/third_party/android_deps/libs/com_google_firebase_firebase_installations * src/third_party/android_deps/libs/com_google_firebase_firebase_iid * src/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json * src/third_party/android_deps/libs/com_google_firebase_firebase_encoders * src/third_party/android_deps/libs/com_google_android_datatransport_transport_api * src/third_party/android_deps/libs/com_google_firebase_firebase_annotations * src/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop * src/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop * src/third_party/android_deps/libs/com_google_firebase_firebase_components * src/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging * src/third_party/android_deps/libs/com_google_firebase_firebase_common * src/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector DEPS diff: https://chromium.googlesource.com/chromium/src/+/e3ed290da5..61b8ff5c89/DEPS No update to Clang. TBR=titovartem@google.com, BUG=None Change-Id: I39fa5f9265b44ba6caad9e5d6b81607571441abd Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203980 Reviewed-by: Artem Titov Reviewed-by: Mirko Bonadei Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#33079} --- DEPS | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 159 insertions(+), 16 deletions(-) diff --git a/DEPS b/DEPS index 467d5c3153..68a1835d28 100644 --- a/DEPS +++ b/DEPS @@ -7,37 +7,37 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': 'e3ed290da5f111b55ae72de3eaf8ea249d057867', + 'chromium_revision': '61b8ff5c89d9186168bf16b09c99ff589d82f780', } 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@5397c2600cd12781d5d0bb9a65178e9b2981eefb', + 'https://chromium.googlesource.com/chromium/src/base@acfa7a9bdd93c617aac526ce597cb7a1d0a8f973', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@4ba9b319074accc34cfc309a240e3bab1dbad7ab', + 'https://chromium.googlesource.com/chromium/src/build@fcaf1b1b3620b302a606f84ddae2079e0a90140c', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@13547b97dad2cdf1b3726b07b2563b921068a018', + 'https://chromium.googlesource.com/chromium/src/buildtools@e3db55b4639f2a331af6f3708ca1fbd22322aac3', # 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@8790968c74e187522e29fe438f9a6ef447e7ebe5', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@77fffc677e11aff8ecb19397579f720e3ae15e22', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@01cab16640b4bd5596d5c396002d706b0e414f76', + 'https://chromium.googlesource.com/chromium/src/testing@001e33eea6c4a29df01fdeaa24bbde334f8ed725', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@cc28b65885fae1d9f5a4f5588dcfd46e03049285', + 'https://chromium.googlesource.com/chromium/src/third_party@e9e90a85fac2cd68eb8e9ce42014bbf4119f7e05', 'src/buildtools/linux64': { 'packages': [ { 'package': 'gn/gn/linux-amd64', - 'version': 'git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e', + 'version': 'git_revision:55ad154c961d8326315b1c8147f4e504cd95e9e6', } ], 'dep_type': 'cipd', @@ -47,7 +47,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/mac-${{arch}}', - 'version': 'git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e', + 'version': 'git_revision:55ad154c961d8326315b1c8147f4e504cd95e9e6', } ], 'dep_type': 'cipd', @@ -57,7 +57,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/windows-amd64', - 'version': 'git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e', + 'version': 'git_revision:55ad154c961d8326315b1c8147f4e504cd95e9e6', } ], 'dep_type': 'cipd', @@ -65,7 +65,7 @@ deps = { }, 'src/buildtools/clang_format/script': - 'https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git@96636aa0e9f047f17447f2d45a094d0b59ed7917', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@99803d74e35962f63a775f29477882afd4d57d94', 'src/buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@d9040c75cfea5928c804ab7c235fed06a63f743a', 'src/buildtools/third_party/libc++abi/trunk': @@ -122,14 +122,14 @@ deps = { 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@e3d485f73f5836fdd6fb287ab96973c4f63175e1', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@957dfeae2968ae6cde9d8f44c91ff1a78d903f9f', + 'https://chromium.googlesource.com/catapult.git@1cd5ea42acb73f0cb3144bd16a110161600e6b76', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@f08e425f2d22be925f3aa2952c5a6a958a26f97a', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@fade894c7e0cbf760cc9c0f48053b64f2babb0ba', 'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@841aa72c9e153ae5f952e31e4b6406870555922d', 'src/third_party/findbugs': { @@ -190,7 +190,7 @@ deps = { 'src/third_party/libFuzzer/src': 'https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer.git@debe7d2d1982e540fbd6bd78604bf001753f9e74', 'src/third_party/libjpeg_turbo': - 'https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@518d81558c797486e125e37cb529d65b560a6ea0', + 'https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@fa0de07678c9828cc57b3eb086c03771912ba527', 'src/third_party/libsrtp': 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@7990ca64c616b150a9cb4714601c4a3b0c84fe91', 'src/third_party/libaom/source/libaom': @@ -200,7 +200,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@122834484af3d2f68b0ee0320d0e9e08e4d59bad', + 'https://android.googlesource.com/platform/external/perfetto.git@17fea3e29e06aa364b040a696c78251fc44bc2cd', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@576e0801f9281fd54e2c69ad5be5fef7af656011', 'src/third_party/libyuv': @@ -257,7 +257,7 @@ deps = { 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@262a9440ba4b2019c922237737506c110c580731', + 'https://chromium.googlesource.com/chromium/src/tools@f4260d3a548083dbca28a79e11d187735926bdd4', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@a32a1607f6093d338f756c7e7c7b4333b0c50c9c', @@ -1750,6 +1750,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_android_datatransport_transport_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_api', + 'version': 'version:2.2.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth': { 'packages': [ { @@ -1838,6 +1849,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging', + 'version': 'version:16.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_fido': { 'packages': [ { @@ -2179,6 +2201,127 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_firebase_firebase_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_annotations', + 'version': 'version:16.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common', + 'version': 'version:19.5.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_components': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_components', + 'version': 'version:16.1.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_encoders': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders', + 'version': 'version:16.1.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json', + 'version': 'version:17.1.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_iid': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid', + 'version': 'version:21.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop', + 'version': 'version:17.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_installations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations', + 'version': 'version:16.3.5-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop', + 'version': 'version:16.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector', + 'version': 'version:18.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_firebase_firebase_messaging': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_messaging', + 'version': 'version:21.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format': { 'packages': [ {