From eac31b7dbe46357b502da630bc97029d9d836c2e Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Thu, 15 Apr 2021 19:48:36 -0400 Subject: [PATCH] Android: Include android-deps into Android checkout. These auto-generated deps are necessary for the standalone build. Updates the roll script to start including these automatically. Bug: angleproject:2344 Change-Id: I389c203a2ddb971e3aeccb728cf37e232f32031e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2826479 Commit-Queue: Jamie Madill Reviewed-by: Yuly Novikov --- .gitignore | 1 + DEPS | 1813 +++++++++++++++++++++++++++++++++ scripts/roll_chromium_deps.py | 32 +- 3 files changed, 1839 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f10563862..f1d65cb24 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ /src/tests/third_party/gles_conformance_tests /testing /third_party/abseil-cpp +/third_party/android_deps /third_party/android_ndk /third_party/catapult /third_party/cherry diff --git a/DEPS b/DEPS index 51786f9e7..82b2cb450 100644 --- a/DEPS +++ b/DEPS @@ -146,6 +146,11 @@ deps = { 'condition': 'not build_with_chromium', }, + 'third_party/android_deps': { + 'url': '{chromium_git}/chromium/src/third_party/android_deps@e0c163da445e0f5fa0e9df169a58976ce114ad56', + 'condition': 'checkout_android and not build_with_chromium', + }, + 'third_party/android_ndk': { 'url': '{chromium_git}/android_ndk.git@27c0a8d090c666a50e40fceb4ee5b40b1a2d3f87', 'condition': 'checkout_android and not build_with_chromium', @@ -1118,6 +1123,1814 @@ deps = { 'condition': 'checkout_angle_restricted_traces', }, # === ANGLE Restricted Trace Generated Code End === + + # === ANDROID_DEPS Generated Code Start === + # Generated by //scripts/roll_chroium_deps.py + 'third_party/android_deps/libs/android_arch_core_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_core_common', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/android_arch_core_runtime': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_core_runtime', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/android_arch_lifecycle_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/android_arch_lifecycle_common_java8': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common_java8', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/android_arch_lifecycle_livedata': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/android_arch_lifecycle_livedata_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata_core', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/android_arch_lifecycle_runtime': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/android_arch_lifecycle_viewmodel': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_viewmodel', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent', + 'version': 'version:2@3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/classworlds_classworlds': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/classworlds_classworlds', + 'version': 'version:2@1.1-alpha-2.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_animated_vector_drawable': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_animated_vector_drawable', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_appcompat_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_appcompat_v7', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_asynclayoutinflater': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_asynclayoutinflater', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_cardview_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_cardview_v7', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_collections': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_collections', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_coordinatorlayout': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_coordinatorlayout', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_cursoradapter': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_cursoradapter', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_customview': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_customview', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_design': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_design', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_documentfile': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_documentfile', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_drawerlayout': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_drawerlayout', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_interpolator': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_interpolator', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_loader': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_loader', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_localbroadcastmanager': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_localbroadcastmanager', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_multidex': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_multidex', + 'version': 'version:2@1.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_print': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_print', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_recyclerview_v7': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_recyclerview_v7', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_slidingpanelayout': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_slidingpanelayout', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_support_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_annotations', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_support_compat': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_compat', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_support_core_ui': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_ui', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_support_core_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_utils', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_support_fragment': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_fragment', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_support_media_compat': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_media_compat', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_support_v4': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_v4', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_support_vector_drawable': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_vector_drawable', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_swiperefreshlayout': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_swiperefreshlayout', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_transition': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_transition', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_versionedparcelable': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_versionedparcelable', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_support_viewpager': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_support_viewpager', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_tools_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_common', + 'version': 'version:2@30.0.0-alpha10.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_tools_desugar_jdk_libs': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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_configuration', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api', + 'version': 'version:2@30.0.0-alpha10.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine', + 'version': 'version:2@2.8.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms', + 'version': 'version:2@1.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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_auth', + 'version': 'version:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.5.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_android_gms_play_services_auth_base': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', + 'version': 'version:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_android_gms_play_services_base': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base', + 'version': 'version:2@17.5.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_android_gms_play_services_basement': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement', + 'version': 'version:2@17.5.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@19.0.0-beta.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@17.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_android_gms_play_services_tasks': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks', + 'version': 'version:2@17.2.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_android_gms_play_services_vision': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision', + 'version': 'version:2@18.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@18.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_android_material_material': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', + 'version': 'version:2@1.2.0-alpha06.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_auto_auto_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_auto_common', + 'version': 'version:2@0.10.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_auto_service_auto_service': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service', + 'version': 'version:2@1.0-rc6.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_auto_service_auto_service_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations', + 'version': 'version:2@1.0-rc6.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_auto_value_auto_value_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations', + 'version': 'version:2@1.7.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@3.0.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_code_findbugs_jsr305': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', + 'version': 'version:2@3.0.2.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_code_gson_gson': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', + 'version': 'version:2@2.8.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_dagger_dagger': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', + 'version': 'version:2@2.30.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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@2.30.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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@2.30.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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@2.30.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_errorprone_error_prone_annotation': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation', + 'version': 'version:2@2.4.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_errorprone_error_prone_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', + 'version': 'version:2@2.4.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_errorprone_error_prone_check_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api', + 'version': 'version:2@2.4.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_errorprone_error_prone_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core', + 'version': 'version:2@2.4.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations', + 'version': 'version:2@2.4.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_errorprone_javac': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac', + 'version': 'version:2@9+181-r4173-1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@9-dev-r4023-3.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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:2@1.5.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_guava_failureaccess': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess', + 'version': 'version:2@1.0.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_guava_guava': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', + 'version': 'version:2@30.1-jre.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + '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 and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_guava_listenablefuture': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_listenablefuture', + 'version': 'version:2@1.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_j2objc_j2objc_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations', + 'version': 'version:2@1.3.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_protobuf_protobuf_java': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java', + 'version': 'version:2@3.4.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_google_protobuf_protobuf_javalite': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', + 'version': 'version:2@3.13.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils', + 'version': 'version:2@1.3.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_squareup_javapoet': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', + 'version': 'version:2@1.13.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/com_squareup_javawriter': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter', + 'version': 'version:2@2.1.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/javax_annotation_javax_annotation_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api', + 'version': 'version:2@1.3.2.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/javax_annotation_jsr250_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', + 'version': 'version:2@1.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/javax_inject_javax_inject': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject', + 'version': 'version:2@1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/nekohtml_nekohtml': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/nekohtml_nekohtml', + 'version': 'version:2@1.9.6.2.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/nekohtml_xercesminimal': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/nekohtml_xercesminimal', + 'version': 'version:2@1.9.6.2.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/net_ltgt_gradle_incap_incap': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/net_ltgt_gradle_incap_incap', + 'version': 'version:2@0.2.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/net_sf_kxml_kxml2': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/net_sf_kxml_kxml2', + 'version': 'version:2@2.3.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_ant_ant': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant', + 'version': 'version:2@1.8.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_ant_ant_launcher': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant_launcher', + 'version': 'version:2@1.8.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_ant_tasks': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_ant_tasks', + 'version': 'version:2@2.1.3.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_artifact': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_artifact', + 'version': 'version:2@2.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_artifact_manager': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_artifact_manager', + 'version': 'version:2@2.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics', + 'version': 'version:2@2.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_model': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_model', + 'version': 'version:2@2.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_plugin_registry': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_plugin_registry', + 'version': 'version:2@2.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_profile': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_profile', + 'version': 'version:2@2.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_project': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_project', + 'version': 'version:2@2.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_repository_metadata': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_repository_metadata', + 'version': 'version:2@2.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_maven_settings': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_maven_settings', + 'version': 'version:2@2.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_wagon_wagon_file': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_file', + 'version': 'version:2@1.0-beta-6.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_lightweight': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_lightweight', + 'version': 'version:2@1.0-beta-6.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_shared': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_shared', + 'version': 'version:2@1.0-beta-6.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_apache_maven_wagon_wagon_provider_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_apache_maven_wagon_wagon_provider_api', + 'version': 'version:2@1.0-beta-6.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup', + 'version': 'version:2@1.2.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_checkerframework_checker_compat_qual': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual', + 'version': 'version:2@2.5.5.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_checkerframework_checker_qual': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', + 'version': 'version:2@3.5.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_checkerframework_dataflow_shaded': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_shaded', + 'version': 'version:2@3.1.2.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', + 'version': 'version:2@1.17.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default', + 'version': 'version:2@1.0-alpha-9-stable-1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation', + 'version': 'version:2@1.11.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_codehaus_plexus_plexus_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils', + 'version': 'version:2@1.5.15.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_jetbrains_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_annotations', + 'version': 'version:2@13.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib', + 'version': 'version:2@1.4.30.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common', + 'version': 'version:2@1.4.30.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm', + 'version': 'version:2@0.1.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_ow2_asm_asm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm', + 'version': 'version:2@7.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_ow2_asm_asm_analysis': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis', + 'version': 'version:2@7.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_ow2_asm_asm_commons': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons', + 'version': 'version:2@7.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_ow2_asm_asm_tree': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree', + 'version': 'version:2@7.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_ow2_asm_asm_util': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util', + 'version': 'version:2@7.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_pcollections_pcollections': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_pcollections_pcollections', + 'version': 'version:2@2.1.2.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_junit': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_pluginapi': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_resources': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_robolectric': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_sandbox': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_shadowapi': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_shadows_framework': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_shadows_playservices': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_playservices', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_robolectric_utils_reflector': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector', + 'version': 'version:2@4.3.1.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + 'third_party/android_deps/libs/org_threeten_threeten_extra': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_threeten_threeten_extra', + 'version': 'version:2@1.5.0.cr0', + }, + ], + 'condition': 'checkout_android and not build_with_chromium', + 'dep_type': 'cipd', + }, + + # === ANDROID_DEPS Generated Code End === } hooks = [ diff --git a/scripts/roll_chromium_deps.py b/scripts/roll_chromium_deps.py index 4961c1ef6..1a34e5e05 100755 --- a/scripts/roll_chromium_deps.py +++ b/scripts/roll_chromium_deps.py @@ -41,6 +41,7 @@ ANGLE_CHROMIUM_DEPS = [ 'buildtools/win', 'testing', 'third_party/abseil-cpp', + 'third_party/android_deps', 'third_party/catapult', 'third_party/depot_tools', 'third_party/jdk', @@ -457,14 +458,31 @@ def GenerateCommitMessage( def UpdateDepsFile(deps_filename, rev_update, changed_deps, new_cr_content, autoroll): """Update the DEPS file with the new revision.""" - # Autoroll take care of updating chromium_revision - if not autoroll: - with open(deps_filename, 'rb') as deps_file: - deps_content = deps_file.read() + with open(deps_filename, 'rb') as deps_file: + deps_content = deps_file.read() + # Autoroll takes care of updating 'chromium_revision', thus we don't need to. + if not autoroll: + # Update the chromium_revision variable. + deps_content = deps_content.replace(rev_update.current_chromium_rev, + rev_update.new_chromium_rev) - # Update the chromium_revision variable. - deps_content = deps_content.replace(rev_update.current_chromium_rev, - rev_update.new_chromium_rev) + # Add and remove dependencies. For now: only generated android deps. + # Since gclient cannot add or remove deps, we rely on the fact that + # these android deps are located in one place to copy/paste. + deps_re = re.compile(ANDROID_DEPS_START + '.*' + ANDROID_DEPS_END, re.DOTALL) + new_deps = deps_re.search(new_cr_content) + old_deps = deps_re.search(deps_content) + if not new_deps or not old_deps: + faulty = 'Chromium' if not new_deps else 'ANGLE' + raise RollError('Was expecting to find "%s" and "%s"\n' + 'in %s DEPS' % (ANDROID_DEPS_START, ANDROID_DEPS_END, faulty)) + + replacement = new_deps.group(0).replace('src/third_party/android_deps', + 'third_party/android_deps') + replacement = replacement.replace('checkout_android', + 'checkout_android and not build_with_chromium') + + deps_content = deps_re.sub(replacement, deps_content) with open(deps_filename, 'wb') as deps_file: deps_file.write(deps_content)