aboutsummaryrefslogtreecommitdiff
path: root/DEPS
diff options
context:
space:
mode:
authorMirko Bonadei <mbonadei@chromium.org>2021-07-19 17:25:38 +0200
committerlibyuv LUCI CQ <libyuv-scoped@luci-project-accounts.iam.gserviceaccount.com>2021-07-19 17:22:35 +0000
commit2167994165425a03e49b0f67c8c044642db17116 (patch)
tree2a4cad26cd51f40fbbc6aa73cd30a9bd004bb921 /DEPS
parent15c788ea04925e93f3d6a317848d7eca9724a604 (diff)
downloadlibyuv-2167994165425a03e49b0f67c8c044642db17116.tar.gz
Roll chromium_revision 64c8c30faa..eaac4f14d9 (824854:902913)
First roll in almost a year, android device tests fail but that needs to be fixed separately. Change log: https://chromium.googlesource.com/chromium/src/+log/64c8c30faa..eaac4f14d9 Full diff: https://chromium.googlesource.com/chromium/src/+/64c8c30faa..eaac4f14d9 Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/e096814b04..4045370905 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/2d2f9f2b85..fd86d60f33 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/6302c11756..37dc929ecb * src/buildtools/third_party/libc++/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/d9040c75cf..79a2e924d9 * src/buildtools/third_party/libc++abi/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/196ba1aaa8..7d5c92f6cf * src/buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/d999d54f4b..d7b11d7989 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/60ef55beac..57422bee2c * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/40b4417105..c4bd9205ee * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/24ccdf9b75..f7d9d7e9dd * src/third_party/android_ndk: https://chromium.googlesource.com/android_ndk.git/+log/27c0a8d090..401019bf85 * src/third_party/auto/src: https://chromium.googlesource.com/external/github.com/google/auto.git/+log/f40317ae21..00cb81ed09 * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/1607f54fed..a10017c548 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/ccc9dd2835..5cb305306a * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/91bb7506bd..a806594b95 * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/26e2a89598..86b9c9347f * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/4fe018038f..4ec4cd23f4 * src/third_party/harfbuzz-ng/src: https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/c39ab82c90..cc9bb29491 * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/c2a4cae149..2a822c5626 * src/third_party/libjpeg_turbo: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git/+log/d5148db386..ad8b3b0f84 * src/third_party/libunwindstack: https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git/+log/11659d420a..b34a0059a6 * src/third_party/lss: https://chromium.googlesource.com/linux-syscall-support.git/+log/29f7c7e018..92a65a8f5d * src/third_party/nasm: https://chromium.googlesource.com/chromium/deps/nasm.git/+log/19f3fad68d..e9be5fd6d7 * src/third_party/robolectric/robolectric: https://chromium.googlesource.com/external/robolectric.git/+log/2f3e0a3ac4..123d61524d * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/1bb7c085e6..4f73c6f51d * src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/d46ea7635f..a32a1607f6 DEPS diff: https://chromium.googlesource.com/chromium/src/+/64c8c30faa..eaac4f14d9/DEPS Clang version changed llvmorg-12-init-10666-gc9f69ee7:llvmorg-13-init-15163-g98033fdc Details: https://chromium.googlesource.com/chromium/src/+/64c8c30faa..eaac4f14d9/tools/clang/scripts/update.py TBR=fbarchard@chromium.org BUG=libyuv:891 No-Try: True Change-Id: I17c9ae10b1ba1c9b39810f390bbddafa149e1512 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3035171 Reviewed-by: Mirko Bonadei <mbonadei@chromium.org> Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS1504
1 files changed, 434 insertions, 1070 deletions
diff --git a/DEPS b/DEPS
index 625b2c73..6dcfa53f 100644
--- a/DEPS
+++ b/DEPS
@@ -1,20 +1,26 @@
gclient_gn_args_file = 'src/build/config/gclient_args.gni'
+gclient_gn_args = [
+ 'generate_location_tags',
+]
vars = {
'chromium_git': 'https://chromium.googlesource.com',
- 'chromium_revision': '64c8c30faaf969c15c028131dfcd0819208039c1',
+ 'chromium_revision': 'eaac4f14d951eb92181830ed7c346d3ad3ebe7a5',
'gn_version': 'git_revision:6f13aaac55a977e1948910942675c69f2b4f7a94',
+
+ # Keep the Chromium default of generating location tags.
+ 'generate_location_tags': True,
}
deps = {
'src/build':
- Var('chromium_git') + '/chromium/src/build' + '@' + '2d2f9f2b85592bb9af5753ef300c055e6feb709f',
+ Var('chromium_git') + '/chromium/src/build' + '@' + 'fd86d60f33cbc794537c4da2ef7e298d7f81138e',
'src/buildtools':
- Var('chromium_git') + '/chromium/src/buildtools' + '@' + '6302c1175607a436e18947a5abe9df2209e845fc',
+ Var('chromium_git') + '/chromium/src/buildtools' + '@' + '37dc929ecb351687006a61744b116cda601753d7',
'src/testing':
- Var('chromium_git') + '/chromium/src/testing' + '@' + '40b44171056045ed1f85ca0b57485e46c03d7867',
+ Var('chromium_git') + '/chromium/src/testing' + '@' + 'c4bd9205eeb6037d567de781d736ab81ff63ecee',
'src/third_party':
- Var('chromium_git') + '/chromium/src/third_party' + '@' + '24ccdf9b7553446791983bf357261c5e0a4314a0',
+ Var('chromium_git') + '/chromium/src/third_party' + '@' + 'f7d9d7e9dd45109820780e5bfbc3e6f0892d56d7',
'src/buildtools/linux64': {
'packages': [
@@ -50,39 +56,39 @@ deps = {
'src/buildtools/clang_format/script':
Var('chromium_git') + '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git' + '@' + '99803d74e35962f63a775f29477882afd4d57d94',
'src/buildtools/third_party/libc++/trunk':
- Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + 'd9040c75cfea5928c804ab7c235fed06a63f743a',
+ Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + '79a2e924d96e2fc1e4b937c42efd08898fa472d7',
'src/buildtools/third_party/libc++abi/trunk':
- Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' + '196ba1aaa8ac285d94f4ea8d9836390a45360533',
+ Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' + '7d5c92f6cfb1ddb73158233a194bb568c5b13554',
'src/buildtools/third_party/libunwind/trunk':
- Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + 'd999d54f4bca789543a2eb6c995af2d9b5a1f3ed',
+ Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + 'd7b11d7989774617bd7df93af95734faac8c0b2c',
'src/third_party/catapult':
- Var('chromium_git') + '/catapult.git' + '@' + 'ccc9dd2835f5a7c5c82ae3c1a2fbc2fe2fd9dfd1',
+ Var('chromium_git') + '/catapult.git' + '@' + '5cb305306ad74c3b68e432ee221a1943dd79b64d',
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/depot_tools':
- Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '91bb7506bd20ed22b8787e7a8b9975cc07e97175',
+ Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'a806594b95a39141fdbf1f359087a44ffb2deaaf',
'src/third_party/freetype/src':
- Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '26e2a89598d69c7aba76c83f6a1fcf1db17574ab',
+ Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '86b9c9347f99174f4fea3e9deca5800e57a987f2',
'src/third_party/googletest/src':
- Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '4fe018038f87675c083d0cfb6a6b57c274fb1753',
+ Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '4ec4cd23f486bf70efcc5d2caa40f24368f752e3',
'src/third_party/harfbuzz-ng/src':
- Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + 'c39ab82c90479341dcf28eaa8174af6f08c0d7ae',
+ Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + 'cc9bb294919e846ef8a0731b5e9f304f95ef3bb8',
'src/third_party/libjpeg_turbo':
- Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'd5148db386ceb4a608058320071cbed890bd6ad2',
+ Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'ad8b3b0f84baf155f3bde5626c3bf9d20535bcae',
'src/third_party/nasm':
- Var('chromium_git') + '/chromium/deps/nasm.git' + '@' + '19f3fad68da99277b2882939d3b2fa4c4b8d51d9',
+ Var('chromium_git') + '/chromium/deps/nasm.git' + '@' + 'e9be5fd6d723a435ca2da162f9e0ffcb688747c1',
'src/tools':
- Var('chromium_git') + '/chromium/src/tools' + '@' + '1bb7c085e67a0fc8c63511af83299d1632f5a3f3',
+ Var('chromium_git') + '/chromium/src/tools' + '@' + '4f73c6f51dc2198347630219417cbf21a7064bdd',
'src/tools/swarming_client':
- Var('chromium_git') + '/infra/luci/client-py.git' + '@' + 'd46ea7635f2911208268170512cb611412488fd8',
+ Var('chromium_git') + '/infra/luci/client-py.git' + '@' + 'a32a1607f6093d338f756c7e7c7b4333b0c50c9c',
# 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' + '@' + '29f7c7e018f4ce706a709f0b0afbf8bacf869480',
+ 'url': Var('chromium_git') + '/linux-syscall-support.git' + '@' + '92a65a8f5d705d1928874420c8d0d15bde8c89e5',
'condition': 'checkout_android or checkout_linux',
},
@@ -98,13 +104,13 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/auto/src': {
- 'url': Var('chromium_git') + '/external/github.com/google/auto.git' + '@' + 'f40317ae215863102cf87fe0679ad66f4b19454e',
+ 'url': Var('chromium_git') + '/external/github.com/google/auto.git' + '@' + '00cb81ed0959a55eb671e89768934094ca0e5e6f',
'condition': 'checkout_android',
},
'src/third_party/boringssl/src':
- 'https://boringssl.googlesource.com/boringssl.git' + '@' + '1607f54fed72c6589d560254626909a64124f091',
+ 'https://boringssl.googlesource.com/boringssl.git' + '@' + 'a10017c548b0805eb98e7847c37370dbd37cd8d6',
'src/base': {
- 'url': Var('chromium_git') + '/chromium/src/base' + '@' + 'e096814b0448fba1095c6e7be7c7a0b5d7264251',
+ 'url': Var('chromium_git') + '/chromium/src/base' + '@' + '4045370905def8e415021737f13e02ed6444a45c',
'condition': 'checkout_android',
},
'src/third_party/bazel': {
@@ -128,9 +134,19 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_ndk': {
- 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '27c0a8d090c666a50e40fceb4ee5b40b1a2d3f87',
+ 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '401019bf85744311b26c88ced255cd53401af8b7',
'condition': 'checkout_android',
},
+ 'src/third_party/androidx': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/androidx',
+ 'version': 'YiuL0FMMTU_K_n0aBAT3GBA4dMfL8JHhn6dkcz5SFgAC',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
'src/third_party/android_support_test_runner': {
'packages': [
{
@@ -148,10 +164,6 @@ deps = {
'version': '8LZujEmLjSh0g3JciDA3cslSptxKs9HOa_iUPXkOeYQC',
},
{
- 'package': 'chromium/third_party/android_sdk/public/cmdline-tools',
- 'version': 'ijpIFSitwBfaEdO9VXBGPqDHUVzPimXy_whw3aHTN9oC',
- },
- {
'package': 'chromium/third_party/android_sdk/public/emulator',
'version': 'A4EvXZUIuQho0QRDJopMUpgyp6NA3aiDQjGKPUKbowMC',
},
@@ -175,6 +187,10 @@ deps = {
'package': 'chromium/third_party/android_sdk/public/sources/android-29',
'version': '4gxhM8E62bvZpQs7Q3d0DinQaW0RLCIefhXrQBFkNy8C',
},
+ {
+ 'package': 'chromium/third_party/android_sdk/public/cmdline-tools',
+ 'version': 'V__2Ycej-H2-6AcXX5A3gi7sIk74SuN44PBm2uC_N1sC',
+ },
],
'condition': 'checkout_android',
'dep_type': 'cipd',
@@ -253,7 +269,7 @@ deps = {
},
'src/third_party/icu': {
- 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c2a4cae149aae7fd30c4cbe3cf1b30df03b386f1',
+ 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '2a822c5626ab1ed40366758e4740b4f0ea40237d',
},
'src/third_party/icu4j': {
'packages': [
@@ -298,7 +314,7 @@ deps = {
'condition': 'checkout_android',
},
'src/third_party/libunwindstack': {
- 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + '11659d420a71e7323b379ea8781f07c6f384bc7e',
+ 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + 'b34a0059a648f179ef05da2c0927f564bdaea2b3',
'condition': 'checkout_android',
},
'src/third_party/mockito/src': {
@@ -329,7 +345,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/r8',
- 'version': 'N9LppKV-9lFkp7JQtmcLHhm7xHqFv0SPa6aDPtgNCdwC',
+ 'version': 'Nu_mvQJe34CotIXadFlA3w732CJ9EvQGuVs4udcZedAC',
},
],
'condition': 'checkout_android',
@@ -339,7 +355,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/proguard',
- 'version': '3bd778c422ea5496de2ef25c007a517dbb5ce5ca',
+ 'version': 'Fd91BJFVlmiO6c46YMTsdy7n2f5Sk2hVVGlzPLvqZPsC',
},
],
'condition': 'checkout_android',
@@ -353,16 +369,12 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/robolectric',
- 'version': '1KXoOiNP1a_uZNdM2ybWKwAQNow1dHTXTig-ZK4Xgq8C',
+ 'version': 'iC6RDM5EH3GEAzR-1shW_Mg0FeeNE5shq1okkFfuuNQC',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
- 'src/third_party/robolectric/robolectric': {
- 'url': Var('chromium_git') + '/external/robolectric.git' + '@' + '2f3e0a3ac450a17dbf2e7d4eaab3a1f14dda50e6',
- 'condition': 'checkout_android',
- },
'src/third_party/sqlite4java': {
'packages': [
{
@@ -377,7 +389,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/turbine',
- 'version': 'O_jNDJ4VdwYKBSDbd2BJ3mknaTFoVkvE7Po8XIiKy8sC',
+ 'version': 'Om6yIEXgJxuqghErK29h9RcMH6VaymMbxwScwXmcN6EC',
},
],
'condition': 'checkout_android',
@@ -400,17 +412,18 @@ deps = {
# iOS deps:
'src/ios': {
- 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '60ef55beac67e3c0eda1c35ab7944c786b377313',
+ 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '57422bee2ccad3d8b1f0f288845c86df024430d5',
'condition': 'checkout_ios'
},
+ # Everything coming after this is automatically updated by the auto-roller.
# === ANDROID_DEPS Generated Code Start ===
# Generated by //third_party/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.1.1-cr0',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
@@ -421,7 +434,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/android_arch_core_runtime',
- 'version': 'version:1.1.1-cr0',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
@@ -432,7 +445,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common',
- 'version': 'version:1.1.1-cr0',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
@@ -443,7 +456,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common_java8',
- 'version': 'version:1.1.1-cr0',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
@@ -454,7 +467,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata',
- 'version': 'version:1.1.1-cr0',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
@@ -465,7 +478,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata_core',
- 'version': 'version:1.1.1-cr0',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
@@ -476,7 +489,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime',
- 'version': 'version:1.1.1-cr0',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
@@ -487,766 +500,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_viewmodel',
- 'version': 'version:1.1.1-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_activity_activity': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_activity_activity',
- 'version': 'version:1.1.0-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.1.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_annotation_annotation_experimental': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_annotation_annotation_experimental',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_appcompat_appcompat': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_appcompat_appcompat',
- 'version': 'version:1.2.0-beta01-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_appcompat_appcompat_resources': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_appcompat_appcompat_resources',
- 'version': 'version:1.2.0-beta01-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_arch_core_core_common': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_arch_core_core_common',
- 'version': 'version:2.1.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_arch_core_core_runtime': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_arch_core_core_runtime',
- 'version': 'version:2.1.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_asynclayoutinflater_asynclayoutinflater': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_asynclayoutinflater_asynclayoutinflater',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_cardview_cardview': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_cardview_cardview',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_collection_collection': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_collection_collection',
- 'version': 'version:1.1.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_concurrent_concurrent_futures': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_concurrent_concurrent_futures',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_coordinatorlayout_coordinatorlayout': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_coordinatorlayout_coordinatorlayout',
- 'version': 'version:1.1.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_core_core': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_core_core',
- 'version': 'version:1.3.0-beta01-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_cursoradapter_cursoradapter': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_cursoradapter_cursoradapter',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_customview_customview': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_customview_customview',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_documentfile_documentfile': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_documentfile_documentfile',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_drawerlayout_drawerlayout': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_drawerlayout_drawerlayout',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_exifinterface_exifinterface': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_exifinterface_exifinterface',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_fragment_fragment': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_fragment_fragment',
- 'version': 'version:1.2.5-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_gridlayout_gridlayout': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_gridlayout_gridlayout',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_interpolator_interpolator': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_interpolator_interpolator',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_leanback_leanback': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_leanback_leanback',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_leanback_leanback_preference': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_leanback_leanback_preference',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_legacy_legacy_preference_v14': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_preference_v14',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_legacy_legacy_support_core_ui': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_core_ui',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_legacy_legacy_support_core_utils': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_core_utils',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_legacy_legacy_support_v13': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_v13',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_legacy_legacy_support_v4': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_v4',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- '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.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common_java8': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common_java8',
- 'version': 'version:2.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata',
- 'version': 'version:2.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core',
- 'version': 'version:2.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime',
- 'version': 'version:2.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel',
- 'version': 'version:2.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate',
- 'version': 'version:2.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_loader_loader': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_loader_loader',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_localbroadcastmanager_localbroadcastmanager': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_localbroadcastmanager_localbroadcastmanager',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_media_media': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_media_media',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_mediarouter_mediarouter': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_mediarouter_mediarouter',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_multidex_multidex': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_multidex_multidex',
- 'version': 'version:2.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_palette_palette': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_palette_palette',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_preference_preference': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_preference_preference',
- 'version': 'version:1.1.1-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_print_print': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_print_print',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_recyclerview_recyclerview': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_recyclerview_recyclerview',
- 'version': 'version:1.1.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_savedstate_savedstate': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_savedstate_savedstate',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_slice_slice_builders': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_slice_slice_builders',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_slice_slice_core': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_slice_slice_core',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_slidingpanelayout_slidingpanelayout': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_slidingpanelayout_slidingpanelayout',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_swiperefreshlayout_swiperefreshlayout': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_swiperefreshlayout_swiperefreshlayout',
- 'version': 'version:1.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.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_test_espresso_espresso_contrib': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_test_espresso_espresso_contrib',
- 'version': 'version:3.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_test_espresso_espresso_core': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_test_espresso_espresso_core',
- 'version': 'version:3.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_test_espresso_espresso_idling_resource': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_test_espresso_espresso_idling_resource',
- 'version': 'version:3.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_test_espresso_espresso_intents': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_test_espresso_espresso_intents',
- 'version': 'version:3.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_test_espresso_espresso_web': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_test_espresso_espresso_web',
- 'version': 'version:3.2.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.1.1-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.2.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.2.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.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_test_uiautomator_uiautomator': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_test_uiautomator_uiautomator',
- 'version': 'version:2.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_transition_transition': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_transition_transition',
- 'version': 'version:1.2.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_tvprovider_tvprovider': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_tvprovider_tvprovider',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_vectordrawable_vectordrawable': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_vectordrawable_vectordrawable',
- 'version': 'version:1.1.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_vectordrawable_vectordrawable_animated': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_vectordrawable_vectordrawable_animated',
- 'version': 'version:1.1.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_versionedparcelable_versionedparcelable': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_versionedparcelable_versionedparcelable',
- 'version': 'version:1.1.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_viewpager2_viewpager2': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_viewpager2_viewpager2',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_viewpager_viewpager': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_viewpager_viewpager',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_webkit_webkit': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_webkit_webkit',
- 'version': 'version:1.3.0-rc01-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/androidx_window_window': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/androidx_window_window',
- 'version': 'version:1.0.0-alpha01-cr0',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
@@ -1257,7 +511,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent',
- 'version': 'version:3.1-cr0',
+ 'version': 'version:2@3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -1268,7 +522,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/classworlds_classworlds',
- 'version': 'version:1.1-alpha-2-cr0',
+ 'version': 'version:2@1.1-alpha-2.cr0',
},
],
'condition': 'checkout_android',
@@ -1279,7 +533,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_animated_vector_drawable',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1290,7 +544,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_appcompat_v7',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1301,7 +555,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_asynclayoutinflater',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1312,7 +566,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_cardview_v7',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1323,7 +577,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_collections',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1334,7 +588,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_coordinatorlayout',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1345,7 +599,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_cursoradapter',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1356,7 +610,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_customview',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1367,7 +621,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_design',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1378,7 +632,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_documentfile',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1389,18 +643,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_drawerlayout',
- 'version': 'version:28.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/com_android_support_gridlayout_v7': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_android_support_gridlayout_v7',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1411,18 +654,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_interpolator',
- 'version': 'version:28.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/com_android_support_leanback_v17': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_android_support_leanback_v17',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1433,7 +665,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_loader',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1444,18 +676,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_localbroadcastmanager',
- 'version': 'version:28.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/com_android_support_mediarouter_v7': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_android_support_mediarouter_v7',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1466,51 +687,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_multidex',
- 'version': 'version:1.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/com_android_support_palette_v7': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_android_support_palette_v7',
- 'version': 'version:28.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/com_android_support_preference_leanback_v17': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_android_support_preference_leanback_v17',
- 'version': 'version:28.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/com_android_support_preference_v14': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_android_support_preference_v14',
- 'version': 'version:28.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/com_android_support_preference_v7': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_android_support_preference_v7',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@1.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1521,7 +698,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_print',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1532,7 +709,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_recyclerview_v7',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1543,7 +720,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_slidingpanelayout',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1554,7 +731,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_support_annotations',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1565,7 +742,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_support_compat',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1576,7 +753,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_ui',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1587,7 +764,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_utils',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1598,7 +775,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_support_fragment',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1609,18 +786,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_support_media_compat',
- 'version': 'version:28.0.0-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/com_android_support_support_v13': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_v13',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1631,7 +797,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_support_v4',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1642,7 +808,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_support_vector_drawable',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1653,7 +819,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_swiperefreshlayout',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1664,7 +830,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_transition',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1675,7 +841,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_versionedparcelable',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1686,51 +852,62 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_android_support_viewpager',
- 'version': 'version:28.0.0-cr0',
+ 'version': 'version:2@28.0.0.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_core': {
+ 'src/third_party/android_deps/libs/com_android_tools_common': {
'packages': [
{
- 'package': 'chromium/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_core',
- 'version': 'version:1.0.0-beta08-cr0',
+ 'package': 'chromium/third_party/android_deps/libs/com_android_tools_common',
+ 'version': 'version:2@30.0.0-alpha10.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_processor': {
+ 'src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs': {
'packages': [
{
- 'package': 'chromium/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_processor',
- 'version': 'version:1.0.0-beta08-cr0',
+ 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs': {
+ 'src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration': {
'packages': [
{
- 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs',
- 'version': 'version:1.0.10-cr0',
+ 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration',
+ 'version': 'version:2@1.1.1.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration': {
+ 'src/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api': {
'packages': [
{
- 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration',
- 'version': 'version:1.0.10-cr0',
+ 'package': 'chromium/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api',
+ 'version': 'version:2@30.0.0-alpha10.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_tools_sdk_common': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_tools_sdk_common',
+ 'version': 'version:2@30.0.0-alpha10.cr0',
},
],
'condition': 'checkout_android',
@@ -1741,7 +918,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine',
- 'version': 'version:2.8.0-cr0',
+ 'version': 'version:2@2.8.8.cr0',
},
],
'condition': 'checkout_android',
@@ -1752,7 +929,18 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms',
- 'version': 'version:1.0-cr0',
+ 'version': 'version:2@1.0.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ '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.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -1763,7 +951,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1774,7 +962,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone',
- 'version': 'version:17.1.0-cr0',
+ 'version': 'version:2@17.5.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1785,7 +973,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1796,7 +984,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.5.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1807,7 +995,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.5.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1818,7 +1006,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1829,7 +1017,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1840,7 +1028,18 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ '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:2@16.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1851,7 +1050,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido',
- 'version': 'version:18.1.0-cr0',
+ 'version': 'version:2@19.0.0-beta.cr0',
},
],
'condition': 'checkout_android',
@@ -1862,7 +1061,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1873,7 +1072,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1884,7 +1083,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1895,7 +1094,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1906,7 +1105,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1917,7 +1116,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1928,7 +1127,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1939,7 +1138,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1950,7 +1149,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks',
- 'version': 'version:17.0.0-cr0',
+ 'version': 'version:2@17.2.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1961,7 +1160,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision',
- 'version': 'version:18.0.0-cr0',
+ 'version': 'version:2@18.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1972,7 +1171,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common',
- 'version': 'version:18.0.0-cr0',
+ 'version': 'version:2@18.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1983,7 +1182,18 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material',
- 'version': 'version:1.2.0-alpha06-cr0',
+ 'version': 'version:2@1.4.0-rc01.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_play_core': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core',
+ 'version': 'version:2@1.10.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1994,7 +1204,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_auto_auto_common',
- 'version': 'version:0.10-cr0',
+ 'version': 'version:2@0.10.cr0',
},
],
'condition': 'checkout_android',
@@ -2005,7 +1215,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service',
- 'version': 'version:1.0-rc6-cr0',
+ 'version': 'version:2@1.0-rc6.cr0',
},
],
'condition': 'checkout_android',
@@ -2016,7 +1226,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations',
- 'version': 'version:1.0-rc6-cr0',
+ 'version': 'version:2@1.0-rc6.cr0',
},
],
'condition': 'checkout_android',
@@ -2027,18 +1237,18 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations',
- 'version': 'version:1.7-cr0',
+ 'version': 'version:2@1.7.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/com_google_code_findbugs_jFormatString': {
+ 'src/third_party/android_deps/libs/com_google_code_findbugs_jformatstring': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jformatstring',
- 'version': 'version:3.0.0-cr0',
+ 'version': 'version:2@3.0.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2049,7 +1259,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305',
- 'version': 'version:3.0.2-cr0',
+ 'version': 'version:2@3.0.2.cr0',
},
],
'condition': 'checkout_android',
@@ -2060,7 +1270,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson',
- 'version': 'version:2.8.0-cr0',
+ 'version': 'version:2@2.8.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2071,7 +1281,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger',
- 'version': 'version:2.26-cr0',
+ 'version': 'version:2@2.30.cr0',
},
],
'condition': 'checkout_android',
@@ -2082,7 +1292,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler',
- 'version': 'version:2.26-cr0',
+ 'version': 'version:2@2.30.cr0',
},
],
'condition': 'checkout_android',
@@ -2093,7 +1303,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers',
- 'version': 'version:2.26-cr0',
+ 'version': 'version:2@2.30.cr0',
},
],
'condition': 'checkout_android',
@@ -2104,7 +1314,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi',
- 'version': 'version:2.26-cr0',
+ 'version': 'version:2@2.30.cr0',
},
],
'condition': 'checkout_android',
@@ -2115,7 +1325,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation',
- 'version': 'version:2.4.0-cr0',
+ 'version': 'version:2@2.7.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2126,7 +1336,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations',
- 'version': 'version:2.4.0-cr0',
+ 'version': 'version:2@2.7.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2137,7 +1347,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api',
- 'version': 'version:2.4.0-cr0',
+ 'version': 'version:2@2.7.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2148,7 +1358,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core',
- 'version': 'version:2.4.0-cr0',
+ 'version': 'version:2@2.7.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2159,7 +1369,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations',
- 'version': 'version:2.4.0-cr0',
+ 'version': 'version:2@2.7.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2170,7 +1380,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac',
- 'version': 'version:9+181-r4173-1-cr0',
+ 'version': 'version:2@9+181-r4173-1.cr0',
},
],
'condition': 'checkout_android',
@@ -2181,7 +1391,128 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded',
- 'version': 'version:9-dev-r4023-3-cr0',
+ 'version': 'version:2@9-dev-r4023-3.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ '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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@21.0.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2192,7 +1523,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format',
- 'version': 'version:1.5-cr0',
+ 'version': 'version:2@1.5.cr0',
},
],
'condition': 'checkout_android',
@@ -2203,7 +1534,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess',
- 'version': 'version:1.0.1-cr0',
+ 'version': 'version:2@1.0.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2214,7 +1545,18 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava',
- 'version': 'version:27.1-jre-cr0',
+ 'version': 'version:2@30.1-jre.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_guava_guava_android': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android',
+ 'version': 'version:2@30.1-android.cr0',
},
],
'condition': 'checkout_android',
@@ -2225,7 +1567,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_guava_listenablefuture',
- 'version': 'version:1.0-cr0',
+ 'version': 'version:2@1.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2236,7 +1578,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations',
- 'version': 'version:1.1-cr0',
+ 'version': 'version:2@1.3.cr0',
},
],
'condition': 'checkout_android',
@@ -2247,7 +1589,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java',
- 'version': 'version:3.4.0-cr0',
+ 'version': 'version:2@3.4.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2258,7 +1600,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite',
- 'version': 'version:3.13.0-cr0',
+ 'version': 'version:2@3.13.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2269,7 +1611,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils',
- 'version': 'version:1.3.0-cr0',
+ 'version': 'version:2@1.3.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2280,7 +1622,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet',
- 'version': 'version:1.11.1-cr0',
+ 'version': 'version:2@1.13.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2291,18 +1633,18 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter',
- 'version': 'version:2.1.1-cr0',
+ 'version': 'version:2@2.1.1.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/commons_cli_commons_cli': {
+ 'src/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils': {
'packages': [
{
- 'package': 'chromium/third_party/android_deps/libs/commons_cli_commons_cli',
- 'version': 'version:1.3.1-cr0',
+ 'package': 'chromium/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils',
+ 'version': 'version:2@4.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2313,7 +1655,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api',
- 'version': 'version:1.3.2-cr0',
+ 'version': 'version:2@1.3.2.cr0',
},
],
'condition': 'checkout_android',
@@ -2324,7 +1666,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api',
- 'version': 'version:1.0-cr0',
+ 'version': 'version:2@1.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2335,7 +1677,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject',
- 'version': 'version:1-cr0',
+ 'version': 'version:2@1.cr0',
},
],
'condition': 'checkout_android',
@@ -2346,18 +1688,18 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/nekohtml_nekohtml',
- 'version': 'version:1.9.6.2-cr0',
+ 'version': 'version:2@1.9.6.2.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/nekohtml_xercesMinimal': {
+ 'src/third_party/android_deps/libs/nekohtml_xercesminimal': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/nekohtml_xercesminimal',
- 'version': 'version:1.9.6.2-cr0',
+ 'version': 'version:2@1.9.6.2.cr0',
},
],
'condition': 'checkout_android',
@@ -2368,7 +1710,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/net_ltgt_gradle_incap_incap',
- 'version': 'version:0.2-cr0',
+ 'version': 'version:2@0.2.cr0',
},
],
'condition': 'checkout_android',
@@ -2379,7 +1721,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/net_sf_kxml_kxml2',
- 'version': 'version:2.3.0-cr0',
+ 'version': 'version:2@2.3.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2390,7 +1732,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant',
- 'version': 'version:1.8.0-cr0',
+ 'version': 'version:2@1.8.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2401,7 +1743,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant_launcher',
- 'version': 'version:1.8.0-cr0',
+ 'version': 'version:2@1.8.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2412,7 +1754,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_ant_tasks',
- 'version': 'version:2.1.3-cr0',
+ 'version': 'version:2@2.1.3.cr0',
},
],
'condition': 'checkout_android',
@@ -2423,7 +1765,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_artifact',
- 'version': 'version:2.2.1-cr0',
+ 'version': 'version:2@2.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2434,7 +1776,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_artifact_manager',
- 'version': 'version:2.2.1-cr0',
+ 'version': 'version:2@2.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2445,7 +1787,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics',
- 'version': 'version:2.2.1-cr0',
+ 'version': 'version:2@2.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2456,7 +1798,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_model',
- 'version': 'version:2.2.1-cr0',
+ 'version': 'version:2@2.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2467,7 +1809,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_plugin_registry',
- 'version': 'version:2.2.1-cr0',
+ 'version': 'version:2@2.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2478,7 +1820,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_profile',
- 'version': 'version:2.2.1-cr0',
+ 'version': 'version:2@2.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2489,7 +1831,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_project',
- 'version': 'version:2.2.1-cr0',
+ 'version': 'version:2@2.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2500,7 +1842,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_repository_metadata',
- 'version': 'version:2.2.1-cr0',
+ 'version': 'version:2@2.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2511,7 +1853,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_settings',
- 'version': 'version:2.2.1-cr0',
+ 'version': 'version:2@2.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2522,7 +1864,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_file',
- 'version': 'version:1.0-beta-6-cr0',
+ 'version': 'version:2@1.0-beta-6.cr0',
},
],
'condition': 'checkout_android',
@@ -2533,7 +1875,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_lightweight',
- 'version': 'version:1.0-beta-6-cr0',
+ 'version': 'version:2@1.0-beta-6.cr0',
},
],
'condition': 'checkout_android',
@@ -2544,7 +1886,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_shared',
- 'version': 'version:1.0-beta-6-cr0',
+ 'version': 'version:2@1.0-beta-6.cr0',
},
],
'condition': 'checkout_android',
@@ -2555,7 +1897,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_provider_api',
- 'version': 'version:1.0-beta-6-cr0',
+ 'version': 'version:2@1.0-beta-6.cr0',
},
],
'condition': 'checkout_android',
@@ -2566,7 +1908,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup',
- 'version': 'version:1.2.1-cr0',
+ 'version': 'version:2@1.2.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2577,7 +1919,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual',
- 'version': 'version:2.5.3-cr0',
+ 'version': 'version:2@2.5.5.cr0',
},
],
'condition': 'checkout_android',
@@ -2588,7 +1930,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual',
- 'version': 'version:2.10.0-cr0',
+ 'version': 'version:2@3.8.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2599,7 +1941,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_shaded',
- 'version': 'version:3.1.2-cr0',
+ 'version': 'version:2@3.11.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2610,7 +1952,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations',
- 'version': 'version:1.17-cr0',
+ 'version': 'version:2@1.17.cr0',
},
],
'condition': 'checkout_android',
@@ -2621,7 +1963,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default',
- 'version': 'version:1.0-alpha-9-stable-1-cr0',
+ 'version': 'version:2@1.0-alpha-9-stable-1.cr0',
},
],
'condition': 'checkout_android',
@@ -2632,7 +1974,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation',
- 'version': 'version:1.11-cr0',
+ 'version': 'version:2@1.11.cr0',
},
],
'condition': 'checkout_android',
@@ -2643,18 +1985,18 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils',
- 'version': 'version:1.5.15-cr0',
+ 'version': 'version:2@1.5.15.cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/org_jdom_jdom2': {
+ 'src/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit': {
'packages': [
{
- 'package': 'chromium/third_party/android_deps/libs/org_jdom_jdom2',
- 'version': 'version:2.0.6-cr0',
+ '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',
@@ -2665,7 +2007,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_annotations',
- 'version': 'version:13.0-cr0',
+ 'version': 'version:2@13.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2676,7 +2018,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib',
- 'version': 'version:1.3.50-cr0',
+ 'version': 'version:2@1.5.10.cr0',
},
],
'condition': 'checkout_android',
@@ -2687,7 +2029,51 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common',
- 'version': 'version:1.3.50-cr0',
+ 'version': 'version:2@1.5.10.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7',
+ 'version': 'version:2@1.5.0.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8',
+ 'version': 'version:2@1.5.0.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android',
+ 'version': 'version:2@1.5.0.cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm',
+ 'version': 'version:2@1.5.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2698,7 +2084,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm',
- 'version': 'version:0.1.0-cr0',
+ 'version': 'version:2@0.1.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2709,7 +2095,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm',
- 'version': 'version:7.0-cr0',
+ 'version': 'version:2@7.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2720,7 +2106,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis',
- 'version': 'version:7.0-cr0',
+ 'version': 'version:2@7.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2731,7 +2117,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons',
- 'version': 'version:7.0-cr0',
+ 'version': 'version:2@7.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2742,7 +2128,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree',
- 'version': 'version:7.0-cr0',
+ 'version': 'version:2@7.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2753,7 +2139,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util',
- 'version': 'version:7.0-cr0',
+ 'version': 'version:2@7.0.cr0',
},
],
'condition': 'checkout_android',
@@ -2764,7 +2150,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_pcollections_pcollections',
- 'version': 'version:2.1.2-cr0',
+ 'version': 'version:2@2.1.2.cr0',
},
],
'condition': 'checkout_android',
@@ -2775,7 +2161,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2786,7 +2172,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2797,7 +2183,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2808,7 +2194,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2819,7 +2205,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2830,7 +2216,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2841,7 +2227,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2852,7 +2238,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2863,18 +2249,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework',
- 'version': 'version:4.3.1-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
-
- 'src/third_party/android_deps/libs/org_robolectric_shadows_multidex': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_multidex',
- 'version': 'version:4.3.1-cr1',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2885,7 +2260,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_playservices',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2896,7 +2271,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils',
- 'version': 'version:4.3.1-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',
@@ -2907,18 +2282,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector',
- 'version': 'version:4.3.1-cr0',
- },
- ],
- 'condition': 'checkout_android',
- '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:1.5.0-cr0',
+ 'version': 'version:2@4.3.1.cr0',
},
],
'condition': 'checkout_android',