From 38bdf21569b2c00f5cf0a20fcd8ef906ae5198d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Tue, 28 Aug 2018 09:58:37 +0200 Subject: [PATCH] Roll chromium_revision ca3a5e1cbb..076bef0a12 (585726:586605) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manual changes: * Updated the list of generated Android DEPS * Removed javax_inject since it was removed from chromium * Add google-truth and proguard Change log: https://chromium.googlesource.com/chromium/src/+log/ca3a5e1cbb..076bef0a12 Full diff: https://chromium.googlesource.com/chromium/src/+/ca3a5e1cbb..076bef0a12 Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/7bf1a620f7..c1b3d7ad78 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/53a2dfe471..c581678b0d * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/59b5f34e52..c53899f7ec * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/7484a964e5..32e14b307b * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/a3a6c8af12..592ad7bbbf * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/01e8e625ad..7f4f41fa81 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/7a1ed44d24..5d0291214a * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/7b7eb8800b..5cc2afd9b8 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/5592370ea3..c0d010f233 DEPS diff: https://chromium.googlesource.com/chromium/src/+/ca3a5e1cbb..076bef0a12/DEPS No update to Clang. TBR=phoglund@webrtc.org, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Remove javax_inject Update generated Android DEPS. Change-Id: I9a0c7bb9f43d4a991a3bf4c7cf247b864e12937a Reviewed-on: https://webrtc-review.googlesource.com/96422 Commit-Queue: Patrik Höglund Reviewed-by: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#24466} --- DEPS | 428 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 401 insertions(+), 27 deletions(-) diff --git a/DEPS b/DEPS index 70c38642e3..9d8fc8ef26 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'webrtc_git': 'https://webrtc.googlesource.com', - 'chromium_revision': 'ca3a5e1cbb792be549303987e0fc387092f7ee81', + 'chromium_revision': '076bef0a120855ee8a8e28757d08b70f80711b5d', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -16,7 +16,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. - 'boringssl_revision': '01e8e625ad83cc9a07288bd4dc285bd8b0ccd550', + 'boringssl_revision': '7f4f41fa81c03e0f8ef1ab5b3d1d566b5968f107', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lss # and whatever else without interference from each other. @@ -24,7 +24,7 @@ vars = { # 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': '7a1ed44d248aa00191dbe8682b47bb5171c73e6a', + 'catapult_revision': '5d0291214a16b137a2c1ba9e67044402ffd71905', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -42,9 +42,9 @@ deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - Var('chromium_git') + '/chromium/src/base' + '@' + '7bf1a620f703c02b86e7513e58c046fdbffcce15', + Var('chromium_git') + '/chromium/src/base' + '@' + 'c1b3d7ad7892d7a25eaa7041a292287bc51ff1e3', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '53a2dfe471036b09135563819e49e44dfd8b4295', + Var('chromium_git') + '/chromium/src/build' + '@' + 'c581678b0d7ebcf2b93e2862080d0d5b69b7ef6c', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + '2dff9c9c74e9d732e6fe57c84ef7fd044cc45d96', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -54,13 +54,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '59b5f34e52dd5a7ef0362dba0e2061d88667d2c0', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'c53899f7ec25bde08b3343c88c00e5c653b1fd23', 'condition': 'checkout_ios', }, 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '7484a964e5687aa53677ce99d1a220d4c4839402', + Var('chromium_git') + '/chromium/src/testing' + '@' + '32e14b307b199d34f17db81ff5b180e1ae15ddec', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + 'a3a6c8af12026c268349ddecd0dc5643a6ea6cae', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '592ad7bbbf50b6ea46256f63a7eb45a1ebf1bbea', 'src/third_party/android_ndk': { 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '4e2cea441bfd43f0863d14f57b1e1844260b9884', 'condition': 'checkout_android', @@ -84,7 +84,7 @@ deps = { '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' + '@' + '7b7eb8800be040d4405fe1d04f002ad1f3a5a38f', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '5cc2afd9b8fae7e6f2d0f0c07abf14a2a2916ee7', 'src/third_party/errorprone/lib': { 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7', 'condition': 'checkout_android', @@ -175,7 +175,7 @@ deps = { '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' + '@' + '5592370ea37c436977e09f3180e891b0cc0d68f3', + Var('chromium_git') + '/chromium/src/tools' + '@' + 'c0d010f2339916254f347d5975164c4fc5ef3b74', 'src/tools/swarming_client': Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'), @@ -311,17 +311,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/javax_inject': { - 'packages': [ - { - 'package': 'chromium/third_party/javax_inject', - 'version': 'version:1-cr0', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/objenesis': { 'packages': [ { @@ -344,6 +333,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/proguard': { + 'packages': [ + { + 'package': 'chromium/third_party/proguard', + 'version': '3bd778c422ea5496de2ef25c007a517dbb5ce5ca', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/robolectric': { 'packages': [ { @@ -366,6 +366,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/google-truth': { + 'packages': [ + { + 'package': 'chromium/third_party/google-truth', + 'version': 'version:0.40', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/xstream': { 'packages': [ { @@ -378,6 +389,8 @@ deps = { }, # === ANDROID_DEPS Start === + # Copied from chromium DEPS, which in turn are generated by + # //tools/android/roll/android_deps/fetch_all.py. 'src/third_party/android_deps/libs/android_arch_core_common': { 'packages': [ { @@ -388,6 +401,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/android_arch_lifecycle_common': { 'packages': [ { @@ -398,6 +412,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/android_arch_lifecycle_runtime': { 'packages': [ { @@ -408,6 +423,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_animated_vector_drawable': { 'packages': [ { @@ -418,6 +434,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_appcompat_v7': { 'packages': [ { @@ -428,6 +445,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_cardview_v7': { 'packages': [ { @@ -438,6 +456,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_design': { 'packages': [ { @@ -448,6 +467,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_gridlayout_v7': { 'packages': [ { @@ -458,6 +478,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_leanback_v17': { 'packages': [ { @@ -468,6 +489,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_mediarouter_v7': { 'packages': [ { @@ -478,6 +500,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_multidex': { 'packages': [ { @@ -488,6 +511,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_palette_v7': { 'packages': [ { @@ -498,6 +522,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_preference_leanback_v17': { 'packages': [ { @@ -508,6 +533,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_preference_v14': { 'packages': [ { @@ -518,6 +544,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_preference_v7': { 'packages': [ { @@ -528,6 +555,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_recyclerview_v7': { 'packages': [ { @@ -538,6 +566,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_support_annotations': { 'packages': [ { @@ -548,6 +577,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_support_compat': { 'packages': [ { @@ -558,6 +588,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_support_core_ui': { 'packages': [ { @@ -568,6 +599,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_support_core_utils': { 'packages': [ { @@ -578,6 +610,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_support_fragment': { 'packages': [ { @@ -588,6 +621,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_support_media_compat': { 'packages': [ { @@ -598,6 +632,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_support_v13': { 'packages': [ { @@ -608,6 +643,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_support_v4': { 'packages': [ { @@ -618,6 +654,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_support_vector_drawable': { 'packages': [ { @@ -628,6 +665,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_android_support_transition': { 'packages': [ { @@ -638,16 +676,29 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_base': { + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base', - 'version': 'version:12.0.1-cr0', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', + 'version': 'version:15.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base': { 'packages': [ { @@ -658,6 +709,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_base': { 'packages': [ { @@ -668,6 +720,7 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_basement': { 'packages': [ { @@ -678,6 +731,139 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast', + 'version': 'version:16.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework', + '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', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_fido': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido', + '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', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_gcm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm', + 'version': 'version:15.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_iid': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid', + 'version': 'version:15.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps', + 'version': 'version:16.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_location': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location', + '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', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_tasks': { 'packages': [ { @@ -688,16 +874,204 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/google-truth': { + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision': { 'packages': [ { - 'package': 'chromium/third_party/google-truth', - 'version': 'version:0.40', + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision', + 'version': 'version:15.0.1-cr0', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, + + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common', + 'version': 'version:15.0.1-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:1.3.0-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_android': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_android_jarimpl': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_jarimpl', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_android_processor': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_processor', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_android_support': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_support', + 'version': 'version:2.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_dagger_dagger_android_support_jarimpl': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_support_jarimpl', + '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_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-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_squareup_javapoet': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', + 'version': 'version:1.11.0-cr0', + }, + ], + 'condition': 'checkout_android', + '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', + }, # === ANDROID_DEPS End === }