diff --git a/DEPS b/DEPS index 043afd63ff..c53b5c90a9 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': 'af61d3db79eb33d231ead0c4e7b6fe6b6b88a361', + 'chromium_revision': '70faffcc69f4c6f3887dcdf86f36fc1918418a63', # Keep the Chromium default of generating location tags. 'generate_location_tags': True, @@ -40,24 +40,24 @@ vars = { deps = { # TODO(kjellander): Move this to be Android-only. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@cdd1a26e245c95fb3827835cf6f8c130a4937906', + 'https://chromium.googlesource.com/chromium/src/base@5419c4cba6edabd0cc98b3e2249b90fd28207bef', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@027873b8b5a21805d3ab7972df2dbdc20d3354b2', + 'https://chromium.googlesource.com/chromium/src/build@f8bd41b27f419f87262062fb80d66c0587f57ad8', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@b47f3d62c4643b07f4254c57dd1956d66f265589', + 'https://chromium.googlesource.com/chromium/src/buildtools@f4d21475bff29e0a8c8cb5e87bb675caed2f7dfe', # 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@b5d77286ddf8a9ce0b7ba3d23af6faf264d60d3d', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@a7d71939fe575a8352ba5ac3b0908f8ec4073c5c', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@0d14179dd670f07e1d3cada6ded58cbcb1f7ed5d', + 'https://chromium.googlesource.com/chromium/src/testing@c2eb333023f95f253a6f18c00f28517eb9c85a84', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@c94aa84abe0f8377b7e9dbc85be131ae6f99bd20', + 'https://chromium.googlesource.com/chromium/src/third_party@92b84a6a12d80145bd9b8ff63f6c664ed79ab7e8', 'src/buildtools/linux64': { 'packages': [ @@ -103,7 +103,7 @@ 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@eddc4cee0995875d2d91a944edaa08112174a172', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@31d65528d85f27f0363a4f8c71dc5646fca6eff0', 'src/buildtools/third_party/libc++abi/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@db2a783a7d1ef0f0ef31da4b6e3de0c31fcfd93f', 'src/buildtools/third_party/libunwind/trunk': @@ -175,7 +175,7 @@ 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@c9127e51dcc18a2c91968af10ba6303cf9a5abd4', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@17b26efb65199176f999fc4193a2350be03afc53', 'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@b9f01c3c54576330b2cf8918c54d5ee5be8faefe', 'src/third_party/grpc/src': { @@ -243,7 +243,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@6f9968b593b7f806a59655e7fa1f3682b5c2f5aa', + 'https://android.googlesource.com/platform/external/perfetto.git@626735b5d9b233ae6ce10bf70f7fa397398e103f', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@9d6d0624d7943a09cc0be9df1a7402522989ac1a', 'src/third_party/libyuv': @@ -292,7 +292,7 @@ deps = { 'condition': 'checkout_android', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@c9f061eacba6f8587f8cd9cbf2233aca87dbbdd2', + 'https://chromium.googlesource.com/chromium/src/tools@7f1c4a860fc91a794a7a9ccc3e30eaf6a47c9a16', 'src/third_party/accessibility_test_framework': { 'packages': [ @@ -481,11 +481,11 @@ deps = { 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', - 'version': 'git_revision:c893d7a542f324fe7c1a63c83e57ccea23631ffe', + 'version': 'git_revision:68db0a380b05a254176063bc957469b5f3e3ee7d', }, { 'package': 'infra/tools/luci/swarming/${{platform}}', - 'version': 'git_revision:c893d7a542f324fe7c1a63c83e57ccea23631ffe', + 'version': 'git_revision:68db0a380b05a254176063bc957469b5f3e3ee7d', }, ], 'dep_type': 'cipd', @@ -989,6 +989,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_android_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_annotations', + 'version': 'version:2@4.1.1.4.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework': { 'packages': [ { @@ -1323,7 +1334,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', - 'version': 'version:2@2.8.0.cr1', + 'version': 'version:2@2.9.0.cr1', }, ], 'condition': 'checkout_android', @@ -1620,7 +1631,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android', - 'version': 'version:2@31.0-android.cr1', + 'version': 'version:2@31.1-android.cr1', }, ], 'condition': 'checkout_android', @@ -1664,7 +1675,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', - 'version': 'version:2@3.19.3.cr1', + 'version': 'version:2@3.21.1.cr1', }, ], 'condition': 'checkout_android', @@ -1715,6 +1726,83 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/io_grpc_grpc_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_api', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_binder': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_binder', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_context': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_context', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_core', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_grpc_grpc_stub': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_stub', + 'version': 'version:2@1.49.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/io_perfmark_perfmark_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/io_perfmark_perfmark_api', + 'version': 'version:2@0.25.0.cr1', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/javax_annotation_javax_annotation_api': { 'packages': [ { @@ -1862,7 +1950,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', - 'version': 'version:2@1.17.cr1', + 'version': 'version:2@1.21.cr1', }, ], 'condition': 'checkout_android',