From db5c9792473b211b718ae1fe4ec61ec3ccfe8c5c Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Fri, 19 Jul 2019 15:30:09 +0200 Subject: [PATCH] Roll chromium_revision 4476bd69d1..e02114c8fa Roll all versions in the DEPS file to match WebRTC's file https://webrtc.googlesource.com/src/+/1a49c1338830b222bc6b22b4e0690615bcd6fa52/DEPS Change log: https://chromium.googlesource.com/chromium/src/+log/4476bd69d1..e02114c8fa Bug: None Change-Id: Id70ae5fbac30ab73f71b83d8a8637dca220e7d5c Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/1709450 Commit-Queue: Mirko Bonadei Commit-Queue: Oleh Prypin Reviewed-by: Mirko Bonadei --- DEPS | 598 ++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 431 insertions(+), 167 deletions(-) diff --git a/DEPS b/DEPS index c5f81b866..09d565b57 100644 --- a/DEPS +++ b/DEPS @@ -1,79 +1,76 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '4476bd69d1c8e4e1cde8633d3b33c992f7d3a6d0', - 'swarming_revision': '0e3e1c4dc4e79f25a5b58fcbc135dc93183c0c54', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling lss - # and whatever else without interference from each other. - 'lss_revision': 'e6527b0cd469e3ff5764785dadcb39bf7d787154', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling catapult - # and whatever else without interference from each other. - 'catapult_revision': 'a24a725f7834c16b3628bfb63f349b3480bf9592', - # the commit queue can handle CLs rolling android_sdk_build-tools_version - # and whatever else without interference from each other. - 'android_sdk_build-tools_version': 'DLK621q5_Bga5EsOr7cp6bHWWxFKx6UHLu_Ix_m3AckC', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_emulator_version - # and whatever else without interference from each other. - 'android_sdk_emulator_version': 'ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_extras_version - # and whatever else without interference from each other. - 'android_sdk_extras_version': 'iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_patcher_version - # and whatever else without interference from each other. - 'android_sdk_patcher_version': 'I6FNMhrXlpB-E1lOhMlvld7xt9lBVNOO83KIluXDyA0C', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_platform-tools_version - # and whatever else without interference from each other. - 'android_sdk_platform-tools_version': '4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_platforms_version - # and whatever else without interference from each other. - 'android_sdk_platforms_version': 'Kg2t9p0YnQk8bldUv4VA3o156uPXLUfIFAmVZ-Gm5ewC', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_sources_version - # and whatever else without interference from each other. - 'android_sdk_sources_version': 'K9uEn3JvNELEVjjVK_GQD3ZQD3rqAnJSxCWxjmUmRkgC', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_tools_version - # and whatever else without interference from each other. - 'android_sdk_tools_version': 'wYcRQC2WHsw2dKWs4EA7fw9Qsyzu1ds1_fRjKmGxe5QC', - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling android_sdk_tools-lint_version - # and whatever else without interference from each other. - 'android_sdk_tools-lint_version': '89hXqZYzCum3delB5RV7J_QyWkaRodqdtQS0s3LMh3wC', + 'chromium_revision': 'e02114c8fa90f197b41b3309aff3c332dfa05b46', } deps = { 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '669e41d6f18842ed5740449662a71b715dc607c6', + Var('chromium_git') + '/chromium/src/build' + '@' + 'c98642948c05efca3c0f3baafb076ed53965a3b6', 'src/buildtools': - Var('chromium_git') + '/chromium/buildtools.git' + '@' + '0e1cbc4eab6861b0c84bf2ed9a3c4b7aa2063819', + Var('chromium_git') + '/chromium/src/buildtools' + '@' + '7b7a5c0f25f11f3c5a1ed3935324c2c59fbc24a2', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + 'b1c6aeebeabcc177a83ff0a33dc6c3ab03d4aa94', + Var('chromium_git') + '/chromium/src/testing' + '@' + '46959ed82d15b622b3330295ed990ab8bb64a746', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + 'be3e0fc18f2e9ea14d0e9369e539eae5986335fd', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '3b2eb39e313bf84d6ef2ab4f4330d45da1c79494', + + 'src/buildtools/linux64': { + 'packages': [ + { + 'package': 'gn/gn/linux-amd64', + 'version': 'git_revision:972ed755f8e6d31cae9ba15fcd08136ae1a7886f', + } + ], + 'dep_type': 'cipd', + 'condition': 'checkout_linux', + }, + 'src/buildtools/mac': { + 'packages': [ + { + 'package': 'gn/gn/mac-amd64', + 'version': 'git_revision:972ed755f8e6d31cae9ba15fcd08136ae1a7886f', + } + ], + 'dep_type': 'cipd', + 'condition': 'checkout_mac', + }, + 'src/buildtools/win': { + 'packages': [ + { + 'package': 'gn/gn/windows-amd64', + 'version': 'git_revision:972ed755f8e6d31cae9ba15fcd08136ae1a7886f', + } + ], + 'dep_type': 'cipd', + 'condition': 'checkout_win', + }, + + 'src/buildtools/clang_format/script': + Var('chromium_git') + '/chromium/llvm-project/cfe/tools/clang-format.git' + '@' + '96636aa0e9f047f17447f2d45a094d0b59ed7917', + 'src/buildtools/third_party/libc++/trunk': + Var('chromium_git') + '/chromium/llvm-project/libcxx.git' + '@' + '5938e0582bac570a41edb3d6a2217c299adc1bc6', + 'src/buildtools/third_party/libc++abi/trunk': + Var('chromium_git') + '/chromium/llvm-project/libcxxabi.git' + '@' + '0d529660e32d77d9111912d73f2c74fc5fa2a858', + 'src/buildtools/third_party/libunwind/trunk': + Var('chromium_git') + '/external/llvm.org/libunwind.git' + '@' + '69d9b84cca8354117b9fe9705a4430d789ee599b', + 'src/third_party/catapult': - Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'), + Var('chromium_git') + '/catapult.git' + '@' + '42a883d13292b1a8a667ef7be682b7347268ef1c', 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/freetype/src': - Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'd01e28f41f8810c8ea422b854f8722659589fa99', + Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'b110acba9e6f7e40314f0da5d249cb3cb3beeab8', 'src/third_party/googletest/src': - Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '879ac092fde0a19e1b3a61b2546b2a422b1528bc', + Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6077f444da944d96d311d358d761164261f1cdd0', 'src/third_party/harfbuzz-ng/src': - Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + '26c5b54fb09fb45e02c9c4618bcea4958c698953', + Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + '2e7021da7d1726a37822e6a001b9218f82255bc8', 'src/third_party/libjpeg_turbo': - Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '61a2bbaa9aec89cb2c882d87ace6aba9aee49bb9', + Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '14eba7addfdcf0699970fcbac225499858a167f2', 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '720b70524a4424b15fc57e82263568c8ba0496ad', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + '419541c8352b3b75a99c9a5a7c0d1e7b92f3fcf7', + Var('chromium_git') + '/chromium/src/tools' + '@' + 'a99b9c5b68d63f61bd69058c5512595c38aa4fa2', 'src/tools/swarming_client': - Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'), + Var('chromium_git') + '/infra/luci/client-py.git' + '@' + '96f125709acfd0b48fc1e5dae7d6ea42291726ac', # libyuv-only dependencies (not present in Chromium). 'src/third_party/gflags': @@ -84,7 +81,7 @@ deps = { Var('chromium_git') + '/external/webrtc/deps/third_party/gtest-parallel' + '@' + '1dad0e9f6d82ff994130b529d7d814b40eb32b0e', 'src/third_party/lss': { - 'url': Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'), + 'url': Var('chromium_git') + '/linux-syscall-support.git' + '@' + '8048ece6c16c91acfe0d36d1d3cc0890ab6e945c', 'condition': 'checkout_android or checkout_linux', }, @@ -93,7 +90,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/accessibility-test-framework', - 'version': 'version:2.1-cr0', + 'version': 'b5ec1e56e58e56bc1a0c77d43111c37f9b512c8a', }, ], 'condition': 'checkout_android', @@ -103,15 +100,17 @@ deps = { 'url': Var('chromium_git') + '/external/github.com/google/auto.git' + '@' + '8a81a858ae7b78a1aef71ac3905fade0bbd64e82', 'condition': 'checkout_android', }, + 'src/third_party/boringssl/src': + 'https://boringssl.googlesource.com/boringssl.git' + '@' + '09050cb498336655883157c6e6055db9e5542857', 'src/base': { - 'url': Var('chromium_git') + '/chromium/src/base' + '@' + '162a5d66ad148f26bbbe6b6ecaf5c1bafa2173e6', + 'url': Var('chromium_git') + '/chromium/src/base' + '@' + 'ce23ecb4d887d56d648cda12a253129cb6202e62', 'condition': 'checkout_android', }, 'src/third_party/bazel': { 'packages': [ { 'package': 'chromium/third_party/bazel', - 'version': 'version:0.10.0', + 'version': '1794576f65a721eb0af320a0701e48d31f1b2415', }, ], 'condition': 'checkout_android', @@ -121,7 +120,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/bouncycastle', - 'version': 'version:1.46-cr0', + 'version': 'c078e87552ba26e776566fdaf0f22cd8712743d0', }, ], 'condition': 'checkout_android', @@ -135,63 +134,69 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_support_test_runner', - 'version': 'version:0.5-cr0', + 'version': '96d4bf848cd210fdcbca6bcc8c1b4b39cbd93141', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_tools': { - 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'e958d6ea74442d4e0849bb8a018d215a0e78981d', - 'condition': 'checkout_android', - }, 'src/third_party/android_sdk/public': { 'packages': [ { 'package': 'chromium/third_party/android_sdk/public/build-tools', - 'version': Var('android_sdk_build-tools_version'), + 'version': 'DLK621q5_Bga5EsOr7cp6bHWWxFKx6UHLu_Ix_m3AckC', }, { 'package': 'chromium/third_party/android_sdk/public/emulator', - 'version': Var('android_sdk_emulator_version'), + 'version': 'xhyuoquVvBTcJelgRjMKZeoBVSQRjB7pLVJPt5C9saIC', }, { 'package': 'chromium/third_party/android_sdk/public/extras', - 'version': Var('android_sdk_extras_version'), + 'version': 'ppQ4TnqDvBHQ3lXx5KPq97egzF5X2FFyOrVHkGmiTMQC', }, { 'package': 'chromium/third_party/android_sdk/public/patcher', - 'version': Var('android_sdk_patcher_version'), + 'version': 'I6FNMhrXlpB-E1lOhMlvld7xt9lBVNOO83KIluXDyA0C', }, { 'package': 'chromium/third_party/android_sdk/public/platform-tools', - 'version': Var('android_sdk_platform-tools_version'), + 'version': 'MSnxgXN7IurL-MQs1RrTkSFSb8Xd1UtZjLArI8Ty1FgC', }, { 'package': 'chromium/third_party/android_sdk/public/platforms', - 'version': Var('android_sdk_platforms_version'), + 'version': 'Kg2t9p0YnQk8bldUv4VA3o156uPXLUfIFAmVZ-Gm5ewC', }, { 'package': 'chromium/third_party/android_sdk/public/sources', - 'version': Var('android_sdk_sources_version'), + 'version': 'K9uEn3JvNELEVjjVK_GQD3ZQD3rqAnJSxCWxjmUmRkgC', }, { 'package': 'chromium/third_party/android_sdk/public/tools', - 'version': Var('android_sdk_tools_version'), + 'version': 'wYcRQC2WHsw2dKWs4EA7fw9Qsyzu1ds1_fRjKmGxe5QC', }, { 'package': 'chromium/third_party/android_sdk/public/tools-lint', - 'version': Var('android_sdk_tools-lint_version'), + 'version': '89hXqZYzCum3delB5RV7J_QyWkaRodqdtQS0s3LMh3wC', }, ], - 'condition': 'checkout_android_native_support', + 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/tools/clang/dsymutil': { + 'packages': [ + { + 'package': 'chromium/llvm-build-tools/dsymutil', + 'version': 'OWlhXkmj18li3yhJk59Kmjbc5KdgLh56TwCd1qBdzlIC', + } + ], + 'condition': 'checkout_mac', + 'dep_type': 'cipd', + }, 'src/third_party/android_build_tools/aapt2': { 'packages': [ { - 'package': 'chromium/third_party/android_tools_aapt2', - 'version': 'version:3.2.0-alpha18-4804415-cr0', + 'package': 'chromium/third_party/android_build_tools/aapt2', + 'version': 'version:3.6.0-alpha03-5516695-cr0', }, ], 'condition': 'checkout_android', @@ -201,14 +206,14 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/byte_buddy', - 'version': 'version:1.4.17-cr0', + 'version': 'c9b53316603fc2d997c899c7ca1707f809b918cd', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, 'src/third_party/ced/src': { - 'url': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9', + 'url': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + 'ba412eaaacd3186085babcd901679a48863c7dd5', 'condition': 'checkout_android', }, 'src/third_party/errorprone/lib': { @@ -223,7 +228,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/gson', - 'version': 'version:2.8.0-cr0', + 'version': '681931c9778045903a0ed59856ce2dd8dd7bf7ca', }, ], 'condition': 'checkout_android', @@ -233,7 +238,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/guava', - 'version': 'version:23.0-cr0', + 'version': 'a6fba501f3a0de88b9be1daa2052632de5b96a46', }, ], 'condition': 'checkout_android', @@ -243,20 +248,21 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/hamcrest', - 'version': 'version:1.3-cr0', + 'version': '37eccfc658fe79695d6abb6dd497463c4372032f', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/icu': { - 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'd65301491c513d49163ad29c853eb85c02c8d5b4', + 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'fd97d4326fac6da84452b2d5fe75ff0949368dab', }, 'src/third_party/icu4j': { 'packages': [ { 'package': 'chromium/third_party/icu4j', - 'version': 'version:53.1-cr0', + 'version': 'e87e5bed2b4935913ee26a3ebd0b723ee2344354', }, ], 'condition': 'checkout_android', @@ -266,7 +272,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/intellij', - 'version': 'version:12.0-cr0', + 'version': '77c2721b024b36ee073402c08e6d8428c0295336', }, ], 'condition': 'checkout_android', @@ -288,7 +294,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/objenesis', - 'version': 'version:2.4-cr0', + 'version': '9e367f55e5a65781ee77bfcbaa88fb82b30e75c0', }, ], 'condition': 'checkout_android', @@ -298,7 +304,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/ow2_asm', - 'version': 'version:5.0.1-cr0', + 'version': 'NNAhdJzMdnutUVqfSJm5v0tVazA9l3Dd6CRwH6N4Q5kC', }, ], 'condition': 'checkout_android', @@ -308,7 +314,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'version:1.0.30', + 'version': '6xVKWv-ssICwyU5FC1osaRpeZio2kM4Tko33I_SIK-EC', }, ], 'condition': 'checkout_android', @@ -332,21 +338,21 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/robolectric', - 'version': 'version:3.5.1', + 'version': '1KXoOiNP1a_uZNdM2ybWKwAQNow1dHTXTig-ZK4Xgq8C', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, 'src/third_party/robolectric/robolectric': { - 'url': Var('chromium_git') + '/external/robolectric.git' + '@' + '7e067f1112e1502caa742f7be72d37b5678d3403', + 'url': Var('chromium_git') + '/external/robolectric.git' + '@' + '3d6dcabf5521e028c8efc2778ab6bd8c7b6d923c', 'condition': 'checkout_android', }, 'src/third_party/sqlite4java': { 'packages': [ { 'package': 'chromium/third_party/sqlite4java', - 'version': 'version:0.282-cr0', + 'version': '889660698187baa7c8b0d79f7bf58563125fbd66', }, ], 'condition': 'checkout_android', @@ -360,7 +366,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/xstream', - 'version': 'version:1.4.8-cr0', + 'version': '4278b1b78b86ab7a1a29e64d5aec9a47a9aab0fe', }, ], 'condition': 'checkout_android', @@ -369,7 +375,7 @@ deps = { # iOS deps: 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '44be3c093cf2db7ab4cf1997d6a1a07722f1f391', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '9038e03eb16c7e2f02de53225904a9469da19153', 'condition': 'checkout_ios' }, @@ -381,12 +387,12 @@ deps = { }, # === ANDROID_DEPS Generated Code Start === - # Generated by //tools/android/roll/android_deps/fetch_all.sh + # Generated by //tools/android/roll/android_deps/fetch_all.py 'src/third_party/android_deps/libs/android_arch_core_common': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_core_common', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -397,7 +403,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/android_arch_lifecycle_common_java8': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common_java8', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -408,6 +425,17 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime', + 'version': 'version:1.1.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_annotation_annotation': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_annotation_annotation', 'version': 'version:1.0.0-cr0', }, ], @@ -415,6 +443,72 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common', + 'version': 'version:2.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_test_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_test_core', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_test_ext_junit': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_test_ext_junit', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_test_monitor': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_test_monitor', + 'version': 'version:1.1.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_test_rules': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_test_rules', + 'version': 'version:1.1.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_test_runner': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_test_runner', + 'version': 'version:1.1.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_android_support_animated_vector_drawable': { 'packages': [ { @@ -672,7 +766,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -683,7 +777,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -694,7 +788,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -705,7 +799,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -716,7 +810,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -727,7 +821,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast', - 'version': 'version:12.0.1-cr0', + 'version': 'version:16.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -738,7 +832,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework', - 'version': 'version:12.0.1-cr0', + 'version': 'version:16.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -749,7 +854,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_flags': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -760,7 +876,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -771,7 +887,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -782,7 +898,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps', - 'version': 'version:12.0.1-cr0', + 'version': 'version:16.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -793,7 +909,40 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype', + 'version': 'version:15.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport', + 'version': 'version:15.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_stats': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -804,7 +953,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -815,7 +964,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -826,18 +975,128 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common', - 'version': 'version:12.0.1-cr0', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_play_core': { + 'src/third_party/android_deps/libs/com_google_code_findbugs_jsr305': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core', - 'version': 'version:1.3.0-cr0', + 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', + 'version': 'version:1.3.9-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_compiler': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_producers': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_spi': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', + 'version': 'version:2.1.3-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_errorprone_javac_shaded': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded', + 'version': 'version:9-dev-r4023-3-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format', + 'version': 'version:1.5-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_guava_guava': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', + 'version': 'version:25.0-jre-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations', + 'version': 'version:1.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_protobuf_protobuf_lite': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_lite', + 'version': 'version:3.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -855,6 +1114,61 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/javax_annotation_jsr250_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', + 'version': 'version:1.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/javax_inject_javax_inject': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject', + 'version': 'version:1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/net_sf_kxml_kxml2': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/net_sf_kxml_kxml2', + 'version': 'version:2.3.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual', + 'version': 'version:2.3.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', + 'version': 'version:1.14-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + # === ANDROID_DEPS Generated Code End === } @@ -960,40 +1274,6 @@ hooks = [ 'action': ['python', 'src/build/util/lastchange.py', '-o', 'src/build/util/LASTCHANGE'], }, - # Pull GN binaries. - { - 'name': 'gn_win', - 'pattern': '.', - 'action': [ 'download_from_google_storage', - '--no_resume', - '--platform=win32', - '--no_auth', - '--bucket', 'chromium-gn', - '-s', 'src/buildtools/win/gn.exe.sha1', - ], - }, - { - 'name': 'gn_mac', - 'pattern': '.', - 'action': [ 'download_from_google_storage', - '--no_resume', - '--platform=darwin', - '--no_auth', - '--bucket', 'chromium-gn', - '-s', 'src/buildtools/mac/gn.sha1', - ], - }, - { - 'name': 'gn_linux64', - 'pattern': '.', - 'action': [ 'download_from_google_storage', - '--no_resume', - '--platform=linux*', - '--no_auth', - '--bucket', 'chromium-gn', - '-s', 'src/buildtools/linux64/gn.sha1', - ], - }, # Pull clang-format binaries using checked-in hashes. { 'name': 'clang_format_win', @@ -1020,6 +1300,7 @@ hooks = [ { 'name': 'clang_format_linux', 'pattern': '.', + 'condition': 'host_os == "linux"', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=linux*', @@ -1074,23 +1355,6 @@ hooks = [ '--root', 'src', ], }, - # Android dependencies. Many are downloaded using Google Storage these days. - # They're copied from https://cs.chromium.org/chromium/src/DEPS for all - # such dependencies we share with Chromium. - { - # This downloads SDK extras and puts them in the - # third_party/android_sdk/public/extras directory. - 'name': 'sdkextras', - 'condition': 'checkout_android', - 'pattern': '.', - 'action': ['vpython', - 'src/build/android/play_services/update.py', - 'download' - ], - }, ] -recursedeps = [ - # buildtools provides clang_format, libc++, and libc++abi. - 'src/buildtools', -] +recursedeps = []