diff --git a/.gn b/.gn index f9a5ee6ce..b62075d35 100644 --- a/.gn +++ b/.gn @@ -26,10 +26,10 @@ secondary_source = "//build/secondary/" # "gn check" or "gn gen --check". check_targets = [ "//libyuv/*" ] -# These are the list of GN files that run exec_script. This whitelist exists +# These are the list of GN files that run exec_script. This allowlist exists # to force additional review for new uses of exec_script, which is strongly # discouraged except for gypi_to_gn calls. -exec_script_whitelist = build_dotfile_settings.exec_script_whitelist + +exec_script_allowlist = build_dotfile_settings.exec_script_allowlist + [ "//build_overrides/build.gni" ] default_args = { diff --git a/DEPS b/DEPS index ecc8001fc..1af29b7b6 100644 --- a/DEPS +++ b/DEPS @@ -5,13 +5,13 @@ gclient_gn_args = [ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '908f3898afdb1fca9352cf3827168a66ff914084', - 'gn_version': 'git_revision:c97a86a72105f3328a540f5a5ab17d11989ab7dd', + 'chromium_revision': '3d4d5701ea678f30591177c25341447da7613d54', + 'gn_version': 'git_revision:6d326e97fe0242bf56c3de1a93f887446e80ec63', # ninja CIPD package version. # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja 'ninja_version': 'version:3@1.12.1.chromium.4', # reclient CIPD package version - 'reclient_version': 're_client_version:0.172.0.3cf60ba5-gomaip', + 'reclient_version': 're_client_version:0.177.1.e58c0145-gomaip', # Fetch configuration files required for the 'use_remoteexec' gn arg 'download_remoteexec_cfg': False, # RBE instance to use for running remote builds @@ -25,7 +25,7 @@ vars = { # By default, download the fuchsia sdk from the public sdk directory. 'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/core/', - 'fuchsia_version': 'version:26.20250103.4.1', + 'fuchsia_version': 'version:27.20250409.6.1', # By default, download the fuchsia images from the fuchsia GCS bucket. 'fuchsia_images_bucket': 'fuchsia', 'checkout_fuchsia': False, @@ -37,17 +37,22 @@ vars = { # condition to allowlist deps for non-git-source processing. 'non_git_source': 'True', + + 'android_sdk_build-tools_version': 'y3EsZLg4bxPmpW0oYsAHylywNyMnIwPS3kh1VbQLAFAC', + 'android_sdk_emulator_version': '9lGp8nTUCRRWGMnI_96HcKfzjnxEJKUcfvfwmA3wXNkC', + 'android_sdk_platform-tools_version': 'mjFmRj7k_XR9yj60pYbr9mG38FyEbU5oWdU56bZQ5cwC', + 'android_sdk_platforms_version': '_YHemUrK49JrE7Mctdf5DDNOHu1VKBx_PTcWnZ-cbOAC', } deps = { 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + 'f3e95cc9a07a76a7700eec429dacf0ea55cf9c01', + Var('chromium_git') + '/chromium/src/build' + '@' + 'a86a8f1eefdd612a182b55319bed76eb65543e06', 'src/buildtools': - Var('chromium_git') + '/chromium/src/buildtools' + '@' + 'dc741883264b58654396d30d5b8d077d4d7d758f', + Var('chromium_git') + '/chromium/src/buildtools' + '@' + '085537daf1ccf6afe4e0b4c0a0e4ed5ac5fe55a3', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '4341e4d7a272f95394094b48f1edf1ab7e33c61f', + Var('chromium_git') + '/chromium/src/testing' + '@' + '83917cb85cf04237153d60c397d7125e4ee7cd57', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + 'f25a92da849d82fd0adfee562b04bccf1d9a9a03', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '0aa3190ee46ee4780da62f1008e3c2d67e3b88a4', 'src/buildtools/linux64': { 'packages': [ @@ -57,7 +62,7 @@ deps = { } ], 'dep_type': 'cipd', - 'condition': 'host_os == "linux"', + 'condition': 'checkout_linux', }, 'src/buildtools/mac': { @@ -68,7 +73,7 @@ deps = { } ], 'dep_type': 'cipd', - 'condition': 'host_os == "mac"', + 'condition': 'checkout_mac', }, 'src/buildtools/win': { @@ -79,7 +84,7 @@ deps = { } ], 'dep_type': 'cipd', - 'condition': 'host_os == "win"', + 'condition': 'checkout_win', }, 'src/buildtools/reclient': { @@ -93,7 +98,7 @@ deps = { }, 'src/third_party/catapult': - Var('chromium_git') + '/catapult.git' + '@' + '8491e07230d983b9eb55cdfbf075f0a9d4fb5d28', + Var('chromium_git') + '/catapult.git' + '@' + '4f90fb2788ef6ab4976b523670cb7636718cc947', 'src/third_party/clang-format/script': Var('chromium_git') + '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git' + '@' + '37f6e68a107df43b7d7e044fd36a13cbae3413f2', 'src/third_party/colorama/src': @@ -103,53 +108,53 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '423f1e1914ab4aa7b2bdf804e216d4c097853ba2', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'f40ddcd8d51626fb7be3ab3c418b3f3be801623f', 'third_party/fuchsia-gn-sdk': { 'url': Var('chromium_git') + '/chromium/src/third_party/fuchsia-gn-sdk.git' + '@' + '0d6902558d92fe3d49ba9a8f638ddea829be595b', 'condition': 'checkout_fuchsia', }, 'src/third_party/googletest/src': - Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '7d76a231b0e29caf86e68d1df858308cd53b2a66', + Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '52204f78f94d7512df1f0f3bea1d47437a2c3a58', 'src/third_party/harfbuzz-ng/src': - Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + '1c249be96e27eafd15eb86d832b67fbc3751634b', + Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + '9f83bbbe64654b45ba5bb06927ff36c2e7588495', 'src/third_party/instrumented_libs': { - 'url': Var('chromium_git') + '/chromium/third_party/instrumented_libraries.git' + '@' + '3cc43119a29158bcde39d288a8def4b8ec49baf8', + 'url': Var('chromium_git') + '/chromium/third_party/instrumented_libraries.git' + '@' + '69015643b3f68dbd438c010439c59adc52cac808', 'condition': 'checkout_instrumented_libraries', }, 'src/third_party/libc++/src': - Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + '74dd760826063f15ce4d373b31bc34d1c65e41c2', + Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + '024b5251a7d927941cb93cbb6f811bcb13ec5ba4', 'src/third_party/libc++abi/src': - Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' + '7681005c6233e8a21b97e24c1a3c5c6979927d5a', + Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' + '78140a7276d52a537615d79da1a91b8890cb8287', 'src/third_party/llvm-libc/src': - Var('chromium_git') + '/external/github.com/llvm/llvm-project/libc.git' + '@' + '2019a9e40b0bac10ad29f1a9e2288307b6ef16ce', + Var('chromium_git') + '/external/github.com/llvm/llvm-project/libc.git' + '@' + '54db6cfdef28f8b8888fd74be5a0cd0d0d5ec761', 'src/third_party/libunwind/src': - Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + 'd1e95b102f113ded38974cf06a65fe0457b6004b', + Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + 'e2e6f2a67e9420e770b014ce9bba476fa2ab9874', 'src/third_party/libjpeg_turbo': - Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '927aabfcd26897abb9776ecf2a6c38ea5bb52ab6', + Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'e14cbfaa85529d47f9f55b0f104a579c1061f9ad', 'src/third_party/nasm': - Var('chromium_git') + '/chromium/deps/nasm.git' + '@' + 'f477acb1049f5e043904b87b825c5915084a9a29', + Var('chromium_git') + '/chromium/deps/nasm.git' + '@' + '767a169c8811b090df222a458b25dfa137fc637e', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + '09973d22d8f4110b35bbf133c613b4df2290d465', + Var('chromium_git') + '/chromium/src/tools' + '@' + 'f06b4755aa41b75c62268f5626cafecdef8555bf', # libyuv-only dependencies (not present in Chromium). 'src/third_party/gtest-parallel': Var('chromium_git') + '/external/webrtc/deps/third_party/gtest-parallel' + '@' + '1dad0e9f6d82ff994130b529d7d814b40eb32b0e', 'src/third_party/lss': { - 'url': Var('chromium_git') + '/linux-syscall-support.git' + '@' + 'ce877209e11aa69dcfffbd53ef90ea1d07136521', + 'url': Var('chromium_git') + '/linux-syscall-support.git' + '@' + 'ed31caa60f20a4f6569883b2d752ef7522de51e0', 'condition': 'checkout_android or checkout_linux', }, 'src/third_party/re2/src': - Var('chromium_git') + '/external/github.com/google/re2.git' + '@' + '6dcd83d60f7944926bfd308cc13979fc53dd69ca', + Var('chromium_git') + '/external/github.com/google/re2.git' + '@' + 'c84a140c93352cdabbfb547c531be34515b12228', # Android deps: 'src/third_party/kotlin_stdlib/cipd': { 'packages': [ { 'package': 'chromium/third_party/kotlin_stdlib', - 'version': 'uguVAY3NvbfV4KgHrjjwvtTioMwPwSijfAgBPpbaYk0C', + 'version': 'dpAaSR0n15OMLmQJlIc-ZQ14UqzGBr2LaBEw_rukkl8C', }, ], 'condition': 'checkout_android', @@ -160,7 +165,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/kotlinc', - 'version': 'YrBSUjA4zjPf3DhU2SYlqamxAAQiM2WIeZftsDSjqTAC', + 'version': 'Wood5j4J3uPDtbP0fk868sOS0Y0umzF5X7w6U6QWupgC', }, ], 'condition': 'checkout_android', @@ -182,7 +187,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'gUjEawxv5mQO8yfbuC8W-rx4V3zYE-4LTWggXpZHI4sC', + 'version': 'jYbS8zrbmfTcWph9ZY_BcX8HUPFnwt3fGMfhQcNURSQC', }, ], 'condition': 'checkout_android and non_git_source', @@ -199,30 +204,31 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_sdk/public': { 'packages': [ - { - 'package': 'chromium/third_party/android_sdk/public/build-tools/35.0.0', - 'version': 'DxwAZ3hD551Neu6ycuW5CPnXFrdleRBd93oX1eB_m9YC' - }, - { + { + 'package': 'chromium/third_party/android_sdk/public/build-tools/36.0.0', + 'version': Var('android_sdk_build-tools_version'), + }, + { 'package': 'chromium/third_party/android_sdk/public/emulator', - 'version': '9lGp8nTUCRRWGMnI_96HcKfzjnxEJKUcfvfwmA3wXNkC' - }, - { + 'version': Var('android_sdk_emulator_version'), + }, + { 'package': 'chromium/third_party/android_sdk/public/platform-tools', - 'version': 'WihaseZR6cojZbkzIqwGhpTp92ztaGfqq8njBU8eTXYC' - }, - { - 'package': 'chromium/third_party/android_sdk/public/platforms/android-35', - 'version': 'kIXA-9XuCfOESodXEdOBkW5f1ytrGWdbp3HFp1I8A_0C' - }, - { + 'version': Var('android_sdk_platform-tools_version'), + }, + { + 'package': 'chromium/third_party/android_sdk/public/platforms/android-36', + 'version': Var('android_sdk_platforms_version'), + }, + { 'package': 'chromium/third_party/android_sdk/public/cmdline-tools', - 'version': 'OCGHZKTdjXjIELVI6FMAgcDkfnd_1ybB0_MtljPtz-8C' - } + 'version': 'gekOVsZjseS1w9BXAT3FsoW__ByGDJYS9DgqesiwKYoC', + }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, 'src/tools/clang/dsymutil': { @@ -284,7 +290,7 @@ deps = { 'src/third_party/icu': { - 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'bbccc2f6efc1b825de5f2c903c48be685cd0cf22', + 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b', }, 'src/third_party/icu4j/cipd': { @@ -311,11 +317,12 @@ deps = { 'src/third_party/jdk/current': { 'packages': [ { - 'package': 'chromium/third_party/jdk', - 'version': 'G-WIGWdFIBTPPhv2xPK_lTfI5N7WmfCBh0oTKqX-c5sC', + 'package': 'chromium/third_party/jdk/linux-amd64', + 'version': '2iiuF-nKDH3moTImx2op4WTRetbfhzKoZhH7Xo44zGsC', }, - ], - 'condition': 'host_os == "linux" and checkout_android', + ], + # Needed on Linux for use on chromium_presubmit (for checkstyle). + 'condition': '(checkout_android or checkout_linux) and non_git_source', 'dep_type': 'cipd', }, 'src/third_party/jsr-305/src': { @@ -327,7 +334,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/libunwindstack': { - 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + '215bddfd8eecb7dd990494854a31b70a96d71b3c', + 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + '0d758dd57f42564acecdd7a1e7ac5c8521c1b01a', 'condition': 'checkout_android', }, 'src/third_party/ninja': { @@ -358,7 +365,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'TQJgBofMEzGILWhAM0LXeob_ZpAiDc8w8SBzU0d8o8YC', + 'version': 'S1YW2OlP8ThsNUXDptm52Ouvnwp9t9xpTy5LECvEOw4C', }, ], 'condition': 'checkout_android', @@ -371,7 +378,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'U3Jf_ewWOZyxa6vyO3wjNIgm8XIz1yFk-4k3-wqDL44C', + 'version': 'wvbyt_Mr06Bl4Rcv4zoX-sTk_keiEYxfspOMUufh5nIC', }, ], 'condition': 'checkout_android', @@ -417,7 +424,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/turbine', - 'version': 'dz8pRLjwNlToJ0tS14T-TDQJNikmFXEDByMo-OzBbl0C', + 'version': 'scfGptWnO9bwzbg-jr0mcnVO3NG5KQJvlAQd_JSD5QUC', }, ], 'condition': 'checkout_android', @@ -430,7 +437,7 @@ deps = { # iOS deps: 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '6e4e345fbb2b4f25bb4072d0d0b1cac4ee887126', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'cb94f0a680dbe28b332f7c2c515590c4eaf12d12', 'condition': 'checkout_ios' }, @@ -481,17 +488,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/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 and non_git_source', - 'dep_type': 'cipd', - }, - 'src/third_party/android_deps/cipd/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework': { 'packages': [ { @@ -507,7 +503,29 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_api', - 'version': 'version:2@2.2.1.cr1', + 'version': 'version:2@4.0.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_android_datatransport_transport_backend_cct': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_backend_cct', + 'version': 'version:2@4.0.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_android_datatransport_transport_runtime': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_runtime', + 'version': 'version:2@4.0.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -518,7 +536,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', - 'version': 'version:2@21.1.1.cr1', + 'version': 'version:2@21.3.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -529,7 +547,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', - 'version': 'version:2@18.0.2.cr1', + 'version': 'version:2@18.1.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -540,7 +558,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', - 'version': 'version:2@18.0.10.cr1', + 'version': 'version:2@18.1.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -573,7 +591,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement', - 'version': 'version:2@18.4.0.cr1', + 'version': 'version:2@18.5.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -584,7 +602,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast', - 'version': 'version:2@17.0.0.cr1', + 'version': 'version:2@22.0.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -595,7 +613,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework', - 'version': 'version:2@17.0.0.cr1', + 'version': 'version:2@22.0.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -617,7 +635,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging', - 'version': 'version:2@16.0.0.cr1', + 'version': 'version:2@17.2.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -639,7 +657,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags', - 'version': 'version:2@17.0.0.cr1', + 'version': 'version:2@18.1.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -661,7 +679,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_identity_credentials', - 'version': 'version:2@16.0.0-alpha02.cr1', + 'version': 'version:2@16.0.0-alpha05.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -683,7 +701,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps', - 'version': 'version:2@18.0.1.cr1', + 'version': 'version:2@18.1.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -694,7 +712,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location', - 'version': 'version:2@21.0.1.cr1', + 'version': 'version:2@21.3.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -716,7 +734,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats', - 'version': 'version:2@17.0.0.cr1', + 'version': 'version:2@17.1.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -782,7 +800,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core_common', - 'version': 'version:2@2.0.2.cr1', + 'version': 'version:2@2.0.3.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -793,7 +811,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_feature_delivery', - 'version': 'version:2@2.0.1.cr1', + 'version': 'version:2@2.1.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_ar_impress': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_ar_impress', + 'version': 'version:2@0.0.2.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -837,7 +866,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', - 'version': 'version:2@2.9.0.cr1', + 'version': 'version:2@2.8.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -855,17 +884,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_google_dagger_hilt_core': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_hilt_core', - 'version': 'version:2@2.52.cr1', - }, - ], - 'condition': 'checkout_android and non_git_source', - 'dep_type': 'cipd', - }, - 'src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_annotations': { 'packages': [ { @@ -881,7 +899,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_annotations', - 'version': 'version:2@16.0.0.cr1', + 'version': 'version:2@16.2.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -892,7 +910,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common', - 'version': 'version:2@19.5.0.cr1', + 'version': 'version:2@21.0.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_common_ktx': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common_ktx', + 'version': 'version:2@21.0.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -903,7 +932,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_components', - 'version': 'version:2@16.1.0.cr1', + 'version': 'version:2@18.0.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_datatransport': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_datatransport', + 'version': 'version:2@19.0.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -914,7 +954,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders', - 'version': 'version:2@16.1.0.cr1', + 'version': 'version:2@17.0.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -925,7 +965,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json', - 'version': 'version:2@17.1.0.cr1', + 'version': 'version:2@18.0.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_encoders_proto': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_proto', + 'version': 'version:2@16.0.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -936,7 +987,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid', - 'version': 'version:2@21.0.1.cr1', + 'version': 'version:2@21.1.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -947,7 +998,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop', - 'version': 'version:2@17.0.0.cr1', + 'version': 'version:2@17.1.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -958,7 +1009,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations', - 'version': 'version:2@16.3.5.cr1', + 'version': 'version:2@17.2.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -969,7 +1020,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop', - 'version': 'version:2@16.0.1.cr1', + 'version': 'version:2@17.1.1.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -980,7 +1031,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector', - 'version': 'version:2@18.0.0.cr1', + 'version': 'version:2@20.0.1.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -991,7 +1042,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_messaging', - 'version': 'version:2@21.0.1.cr1', + 'version': 'version:2@24.1.0.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -1086,17 +1137,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/com_squareup_javawriter': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter', - 'version': 'version:2@2.1.1.cr1', - }, - ], - 'condition': 'checkout_android and non_git_source', - 'dep_type': 'cipd', - }, - 'src/third_party/android_deps/cipd/libs/com_squareup_moshi_moshi': { 'packages': [ { @@ -1134,84 +1174,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm', - 'version': 'version:2@5.0.0.cr1', - }, - ], - 'condition': 'checkout_android and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/cipd/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 and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/cipd/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 and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/cipd/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 and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/cipd/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 and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/cipd/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 and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/cipd/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 and non_git_source', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/cipd/libs/io_perfmark_perfmark_api': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_perfmark_perfmark_api', - 'version': 'version:2@0.25.0.cr1', + 'version': 'version:2@5.2.1.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -1240,17 +1203,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/javax_annotation_jsr250_api': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', - 'version': 'version:2@1.0.cr1', - }, - ], - 'condition': 'checkout_android and non_git_source', - 'dep_type': 'cipd', - }, - 'src/third_party/android_deps/cipd/libs/javax_inject_javax_inject': { 'packages': [ { @@ -1343,7 +1295,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', - 'version': 'version:2@1.21.cr1', + 'version': 'version:2@1.17.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -1361,17 +1313,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/cipd/libs/org_hamcrest_hamcrest': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_hamcrest_hamcrest', - 'version': 'version:2@2.2.cr1', - }, - ], - 'condition': 'checkout_android and non_git_source', - 'dep_type': 'cipd', - }, - 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime': { 'packages': [ { @@ -1420,7 +1361,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm', - 'version': 'version:2@1.8.1.cr1', + 'version': 'version:2@1.10.1.cr1', }, ], 'condition': 'checkout_android and non_git_source', @@ -1438,6 +1379,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_play_services': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_play_services', + 'version': 'version:2@1.10.1.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_test_jvm': { 'packages': [ {