From 89127190ce3d54a0a04cdb9afcd13e6725314ce5 Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Wed, 10 Mar 2021 10:02:53 +0000 Subject: [PATCH] Revert "Roll chromium_revision e1b9354ff4..74090df66c (854007:861144)" This reverts commit cb7ff134321aef548034123339ec45c9c1cd0bfe. Reason for revert: iOS 12 bot fails consistently: https://ci.chromium.org/ui/p/webrtc/builders/ci/iOS64%20Sim%20Debug%20(iOS%2012)/5497/overview Original change's description: > Roll chromium_revision e1b9354ff4..74090df66c (854007:861144) > > Change log: https://chromium.googlesource.com/chromium/src/+log/e1b9354ff4..74090df66c > Full diff: https://chromium.googlesource.com/chromium/src/+/e1b9354ff4..74090df66c > > Changed dependencies > * src/base: https://chromium.googlesource.com/chromium/src/base/+log/242517a010..b64741b2d4 > * src/build: https://chromium.googlesource.com/chromium/src/build/+log/251bfc5101..6e85f7f8aa > * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/228b1c1883..368c7dd2c9 > * src/buildtools/third_party/libc++abi/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/196ba1aaa8..c93be42a40 > * src/buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/d999d54f4b..cc80b4ac98 > * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/d365fb8897..171bf5f5ff > * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/7dee089ce5..f8f63f141a > * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/d15b5c89b3..68e9de796c > * src/third_party/android_deps/libs/android_arch_core_common: version:1.1.1-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/android_arch_core_runtime: version:1.1.1-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/android_arch_lifecycle_common: version:1.1.1-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/android_arch_lifecycle_common_java8: version:1.1.1-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/android_arch_lifecycle_livedata: version:1.1.1-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/android_arch_lifecycle_livedata_core: version:1.1.1-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/android_arch_lifecycle_runtime: version:1.1.1-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/android_arch_lifecycle_viewmodel: version:1.1.1-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent: version:3.1-cr0..version:3.1.cr0 > * src/third_party/android_deps/libs/classworlds_classworlds: version:1.1-alpha-2-cr0..version:1.1-alpha-2.cr0 > * src/third_party/android_deps/libs/com_android_support_animated_vector_drawable: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_appcompat_v7: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_asynclayoutinflater: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_cardview_v7: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_collections: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_coordinatorlayout: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_cursoradapter: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_customview: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_design: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_documentfile: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_drawerlayout: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_interpolator: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_loader: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_localbroadcastmanager: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_multidex: version:1.0.0-cr0..version:1.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_print: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_recyclerview_v7: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_slidingpanelayout: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_support_annotations: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_support_compat: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_support_core_ui: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_support_core_utils: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_support_fragment: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_support_media_compat: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_support_v4: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_support_vector_drawable: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_swiperefreshlayout: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_transition: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_versionedparcelable: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_support_viewpager: version:28.0.0-cr0..version:28.0.0.cr0 > * src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs: version:1.0.10-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration: version:1.0.10-cr0..version:1.1.1.cr0 > * src/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine: version:2.8.0-cr0..version:2.8.0.cr0 > * src/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms: version:1.0-cr0..version:1.0.cr0 > * src/third_party/android_deps/libs/com_google_android_datatransport_transport_api: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_auth: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone: version:17.5.0-cr0..version:17.5.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_base: version:17.5.0-cr0..version:17.5.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_basement: version:17.5.0-cr0..version:17.5.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_cast: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging: version:16.0.0-cr0..version:16.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_fido: version:19.0.0-beta-cr0..version:19.0.0-beta.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_flags: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_gcm: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_iid: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_location: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_stats: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_tasks: version:17.2.0-cr0..version:17.2.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_vision: version:18.0.0-cr0..version:18.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common: version:18.0.0-cr0..version:18.0.0.cr0 > * src/third_party/android_deps/libs/com_google_android_material_material: version:1.2.0-alpha06-cr0..version:1.2.0-alpha06.cr0 > * src/third_party/android_deps/libs/com_google_auto_auto_common: version:0.10-cr0..version:0.10.cr0 > * src/third_party/android_deps/libs/com_google_auto_service_auto_service: version:1.0-rc6-cr0..version:1.0-rc6.cr0 > * src/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations: version:1.0-rc6-cr0..version:1.0-rc6.cr0 > * src/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations: version:1.7-cr0..version:1.7.cr0 > * src/third_party/android_deps/libs/com_google_code_findbugs_jsr305: version:3.0.2-cr0..version:3.0.2.cr0 > * src/third_party/android_deps/libs/com_google_code_gson_gson: version:2.8.0-cr0..version:2.8.0.cr0 > * src/third_party/android_deps/libs/com_google_dagger_dagger: version:2.30-cr0..version:2.30.cr0 > * src/third_party/android_deps/libs/com_google_dagger_dagger_compiler: version:2.30-cr0..version:2.30.cr0 > * src/third_party/android_deps/libs/com_google_dagger_dagger_producers: version:2.30-cr0..version:2.30.cr0 > * src/third_party/android_deps/libs/com_google_dagger_dagger_spi: version:2.30-cr0..version:2.30.cr0 > * src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation: version:2.4.0-cr0..version:2.4.0.cr0 > * src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations: version:2.4.0-cr0..version:2.4.0.cr0 > * src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api: version:2.4.0-cr0..version:2.4.0.cr0 > * src/third_party/android_deps/libs/com_google_errorprone_error_prone_core: version:2.4.0-cr0..version:2.4.0.cr0 > * src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations: version:2.4.0-cr0..version:2.4.0.cr0 > * src/third_party/android_deps/libs/com_google_errorprone_javac: version:9+181-r4173-1-cr0..version:9+181-r4173-1.cr0 > * src/third_party/android_deps/libs/com_google_errorprone_javac_shaded: version:9-dev-r4023-3-cr0..version:9-dev-r4023-3.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_annotations: version:16.0.0-cr0..version:16.0.0.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_common: version:19.5.0-cr0..version:19.5.0.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_components: version:16.1.0-cr0..version:16.1.0.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_encoders: version:16.1.0-cr0..version:16.1.0.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json: version:17.1.0-cr0..version:17.1.0.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_iid: version:21.0.1-cr0..version:21.0.1.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop: version:17.0.0-cr0..version:17.0.0.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_installations: version:16.3.5-cr0..version:16.3.5.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop: version:16.0.1-cr0..version:16.0.1.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector: version:18.0.0-cr0..version:18.0.0.cr0 > * src/third_party/android_deps/libs/com_google_firebase_firebase_messaging: version:21.0.1-cr0..version:21.0.1.cr0 > * src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format: version:1.5-cr0..version:1.5.cr0 > * src/third_party/android_deps/libs/com_google_guava_failureaccess: version:1.0.1-cr0..version:1.0.1.cr0 > * src/third_party/android_deps/libs/com_google_guava_guava: version:30.1-jre-cr0..version:30.1-jre.cr0 > * src/third_party/android_deps/libs/com_google_guava_guava_android: version:30.1-android-cr0..version:30.1-android.cr0 > * src/third_party/android_deps/libs/com_google_guava_listenablefuture: version:1.0-cr0..version:1.0.cr0 > * src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations: version:1.3-cr0..version:1.3.cr0 > * src/third_party/android_deps/libs/com_google_protobuf_protobuf_java: version:3.4.0-cr0..version:3.4.0.cr0 > * src/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite: version:3.13.0-cr0..version:3.13.0.cr0 > * src/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils: version:1.3.0-cr0..version:1.3.0.cr0 > * src/third_party/android_deps/libs/com_squareup_javapoet: version:1.13.0-cr0..version:1.13.0.cr0 > * src/third_party/android_deps/libs/com_squareup_javawriter: version:2.1.1-cr0..version:2.1.1.cr0 > * src/third_party/android_deps/libs/javax_annotation_javax_annotation_api: version:1.3.2-cr0..version:1.3.2.cr0 > * src/third_party/android_deps/libs/javax_annotation_jsr250_api: version:1.0-cr0..version:1.0.cr0 > * src/third_party/android_deps/libs/javax_inject_javax_inject: version:1-cr0..version:1.cr0 > * src/third_party/android_deps/libs/nekohtml_nekohtml: version:1.9.6.2-cr0..version:1.9.6.2.cr0 > * src/third_party/android_deps/libs/net_ltgt_gradle_incap_incap: version:0.2-cr0..version:0.2.cr0 > * src/third_party/android_deps/libs/net_sf_kxml_kxml2: version:2.3.0-cr0..version:2.3.0.cr0 > * src/third_party/android_deps/libs/org_apache_ant_ant: version:1.8.0-cr0..version:1.8.0.cr0 > * src/third_party/android_deps/libs/org_apache_ant_ant_launcher: version:1.8.0-cr0..version:1.8.0.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_ant_tasks: version:2.1.3-cr0..version:2.1.3.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_artifact: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_artifact_manager: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_model: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_plugin_registry: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_profile: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_project: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_repository_metadata: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/org_apache_maven_maven_settings: version:2.2.1-cr0..version:2.2.1.cr0 > * src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_file: version:1.0-beta-6-cr0..version:1.0-beta-6.cr0 > * src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_lightweight: version:1.0-beta-6-cr0..version:1.0-beta-6.cr0 > * src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_http_shared: version:1.0-beta-6-cr0..version:1.0-beta-6.cr0 > * src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_provider_api: version:1.0-beta-6-cr0..version:1.0-beta-6.cr0 > * src/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup: version:1.2.1-cr0..version:1.2.1.cr0 > * src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual: version:2.5.5-cr0..version:2.5.5.cr0 > * src/third_party/android_deps/libs/org_checkerframework_checker_qual: version:3.5.0-cr0..version:3.5.0.cr0 > * src/third_party/android_deps/libs/org_checkerframework_dataflow_shaded: version:3.1.2-cr0..version:3.1.2.cr0 > * src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations: version:1.17-cr0..version:1.17.cr0 > * src/third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default: version:1.0-alpha-9-stable-1-cr0..version:1.0-alpha-9-stable-1.cr0 > * src/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation: version:1.11-cr0..version:1.11.cr0 > * src/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils: version:1.5.15-cr0..version:1.5.15.cr0 > * src/third_party/android_deps/libs/org_jetbrains_annotations: version:13.0-cr0..version:13.0.cr0 > * src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib: version:1.3.72-cr0..version:1.3.72.cr0 > * src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common: version:1.3.72-cr0..version:1.3.72.cr0 > * src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm: version:0.1.0-cr0..version:0.1.0.cr0 > * src/third_party/android_deps/libs/org_ow2_asm_asm: version:7.0-cr0..version:7.0.cr0 > * src/third_party/android_deps/libs/org_ow2_asm_asm_analysis: version:7.0-cr0..version:7.0.cr0 > * src/third_party/android_deps/libs/org_ow2_asm_asm_commons: version:7.0-cr0..version:7.0.cr0 > * src/third_party/android_deps/libs/org_ow2_asm_asm_tree: version:7.0-cr0..version:7.0.cr0 > * src/third_party/android_deps/libs/org_ow2_asm_asm_util: version:7.0-cr0..version:7.0.cr0 > * src/third_party/android_deps/libs/org_pcollections_pcollections: version:2.1.2-cr0..version:2.1.2.cr0 > * src/third_party/android_deps/libs/org_robolectric_annotations: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_junit: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_pluginapi: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_resources: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_robolectric: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_sandbox: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_shadowapi: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_shadows_framework: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_shadows_playservices: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_utils: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_robolectric_utils_reflector: version:4.3.1-cr0..version:4.3.1.cr0 > * src/third_party/android_deps/libs/org_threeten_threeten_extra: version:1.5.0-cr0..version:1.5.0.cr0 > * src/third_party/androidx: 09Q7fX-z4zxVsv_sl0K_cenKEZASVgwYe4goJB_KaIsC..0cXqPd9UzaimlGKD6A5oVclporrOAC3RznyC7ICXQ9UC > * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/ce9b002ebd..dfe0b01b3e > * src/third_party/breakpad/breakpad: https://chromium.googlesource.com/breakpad/breakpad.git/+log/e3d485f73f..d6a6f52606 > * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/35976bfcac..4f82770e78 > * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/7386a1e04f..d071f2a8a9 > * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/7849316ccf..fedd945c3e > * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/1b0cdaae57..07f4869221 > * src/third_party/harfbuzz-ng/src: https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/53806e5b83..7686ff854b > * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/12825ed8aa..e6379c8802 > * src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/e72d81ffbc..fb9f22ce8c > * src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/93b1b332cd..a8c181050c > * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/7945040041..37518c39e3 > * src/third_party/r8: F8cKQoSai0fZxFRJVRZnoWeS-oVyp53L7bpuVq9t44AC..p8MxOkeoVbwFeWnyTIOV5apfrUkcEo5Mq0bGVQtF82IC > * src/third_party/usrsctp/usrsctplib: https://chromium.googlesource.com/external/github.com/sctplab/usrsctp/+log/a6647318b5..6e00fe20df > * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/bd77bcca0d..6cf14f8442 > * src/tools/luci-go: git_revision:77944aa535e42e29faadf6cfa81aee252807d468..git_revision:fd10124659e991321df2f8a5d3749687b54ceb0a > * src/tools/luci-go: git_revision:77944aa535e42e29faadf6cfa81aee252807d468..git_revision:fd10124659e991321df2f8a5d3749687b54ceb0a > * src/tools/luci-go: git_revision:77944aa535e42e29faadf6cfa81aee252807d468..git_revision:fd10124659e991321df2f8a5d3749687b54ceb0a > Added dependencies > * src/third_party/android_deps/libs/nekohtml_xercesminimal > * src/third_party/android_deps/libs/com_google_code_findbugs_jformatstring > Removed dependencies > * src/third_party/android_deps/libs/commons_cli_commons_cli > * src/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_core > * src/third_party/android_deps/libs/nekohtml_xercesMinimal > * src/third_party/android_deps/libs/org_jdom_jdom2 > * src/third_party/android_deps/libs/com_google_code_findbugs_jFormatString > * src/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_processor > DEPS diff: https://chromium.googlesource.com/chromium/src/+/e1b9354ff4..74090df66c/DEPS > > Clang version changed llvmorg-13-init-1559-g01b87444:llvmorg-13-init-3462-gfe5c2c3c > Details: https://chromium.googlesource.com/chromium/src/+/e1b9354ff4..74090df66c/tools/clang/scripts/update.py > > TBR=titovartem@webrtc.org, > BUG=None > > Change-Id: Id2b5745ddc858a9cc4aa0ee7c4009fff62fc7fca > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/210962 > Reviewed-by: Artem Titov > Reviewed-by: Mirko Bonadei > Commit-Queue: Artem Titov > Cr-Commit-Position: refs/heads/master@{#33407} Bug: None Change-Id: I7679a2545ac6996df641716d3db9af0143479d33 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211242 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#33415} --- DEPS | 424 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 234 insertions(+), 190 deletions(-) diff --git a/DEPS b/DEPS index a70dc1a227..89d42d68eb 100644 --- a/DEPS +++ b/DEPS @@ -7,31 +7,31 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': '74090df66ce2c542ff953fdac803dc6d19488f53', + 'chromium_revision': 'e1b9354ff443264487bd09d8acd9bcc802abe4e4', } deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@b64741b2d4d846945d658287d305c9ad99f47f7f', + 'https://chromium.googlesource.com/chromium/src/base@242517a010977553f5b3d80dc331c4335ac4e539', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@6e85f7f8aa080145512c52f7873482b8d2a7dad6', + 'https://chromium.googlesource.com/chromium/src/build@251bfc510179b7aad76fa36987ba4036dbd2e398', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@368c7dd2c90cd27cadfa8e653ab6953405f153cc', + 'https://chromium.googlesource.com/chromium/src/buildtools@228b1c188316f6631a591d08502e4b342a5dc3ee', # Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC. 'src/examples/androidtests/third_party/gradle': { 'url': 'https://chromium.googlesource.com/external/github.com/gradle/gradle.git@f2d1fb54a951d8b11d25748e4711bec8d128d7e3', 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@171bf5f5fff1c7eacc879c441837b3da48ff142f', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@d365fb88979ff5e5e63e6252429085d0a6c4dc15', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@f8f63f141a308a9f4fb75db7477ad7b646eb281e', + 'https://chromium.googlesource.com/chromium/src/testing@7dee089ce564d1249d3354ebad15bfc8648e02c0', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@68e9de796cf37c017dbbc70f4a0b67f330899aa7', + 'https://chromium.googlesource.com/chromium/src/third_party@d15b5c89b3542b35d4749d461e68872ec7e3003b', 'src/buildtools/linux64': { 'packages': [ @@ -69,9 +69,9 @@ deps = { 'src/buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@8fa87946779682841e21e2da977eccfb6cb3bded', 'src/buildtools/third_party/libc++abi/trunk': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@c93be42a4007e6fc16ea085f5b47ea50aa9134a8', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@196ba1aaa8ac285d94f4ea8d9836390a45360533', 'src/buildtools/third_party/libunwind/trunk': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@cc80b4ac985d1c05a3d24dc96e4ffa7e98dbc535', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@d999d54f4bca789543a2eb6c995af2d9b5a1f3ed', 'src/tools/clang/dsymutil': { 'packages': [ @@ -118,18 +118,18 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git@dfe0b01b3eb3773d16a099cb1f900f9ca48fc842', + 'https://boringssl.googlesource.com/boringssl.git@ce9b002ebd0491a8dd802e208814360ce781f32b', 'src/third_party/breakpad/breakpad': - 'https://chromium.googlesource.com/breakpad/breakpad.git@d6a6f52606529111b9f0ade9a0e0d9040fa97c1f', + 'https://chromium.googlesource.com/breakpad/breakpad.git@e3d485f73f5836fdd6fb287ab96973c4f63175e1', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@4f82770e78a801033e58a1e6ce6ff941c0ff21e8', + 'https://chromium.googlesource.com/catapult.git@35976bfcac506668c032dec650867e785b67dc91', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@d071f2a8a941d8f7e05eb43319c7b2ab81fc8fdd', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@7386a1e04f2a07de66a39ada64b511affae5cd03', 'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@ebd8895ddb097b985db1fbdc816548549e211af9', 'src/third_party/findbugs': { @@ -142,9 +142,9 @@ deps = { 'condition': 'checkout_linux', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@fedd945c3ea10a86321c7503945b80454ce18956', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@7849316ccfc794026176d462b9008e7f4c4240fe', 'src/third_party/harfbuzz-ng/src': - 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@7686ff854bbb9698bb1469dcfe6d288c695a76b7', + 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@53806e5b83cee0e275eac038d0780f95ac56588c', 'src/third_party/google_benchmark/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@ffe1342eb2faa7d2e7c35b4db2ccf99fab81ec20', }, @@ -162,9 +162,9 @@ deps = { 'dep_type': 'cipd', }, 'src/third_party/googletest/src': - 'https://chromium.googlesource.com/external/github.com/google/googletest.git@07f4869221012b16b7f9ee685d94856e1fc9f361', + 'https://chromium.googlesource.com/external/github.com/google/googletest.git@1b0cdaae57c046c87fb99cb4f69c312a7e794adb', 'src/third_party/icu': { - 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@e6379c8802a00952a90c4bc547171fd4827f974b', + 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@12825ed8aae58df594373d335427f1dd3cae9fd3', }, 'src/third_party/jdk': { 'packages': [ @@ -200,17 +200,17 @@ deps = { 'src/third_party/libsrtp': 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@7990ca64c616b150a9cb4714601c4a3b0c84fe91', 'src/third_party/libaom/source/libaom': - 'https://aomedia.googlesource.com/aom.git@fb9f22ce8c54e277e5162d8643a1a254dcc5173a', + 'https://aomedia.googlesource.com/aom.git@e72d81ffbc23b2c062b66a2d3be841e008514e4b', 'src/third_party/libunwindstack': { 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@11659d420a71e7323b379ea8781f07c6f384bc7e', 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@37518c39e3db120322359090db3d54f6ac100078', + 'https://android.googlesource.com/platform/external/perfetto.git@794504004178288e18b1edfc449411cd269ea0d3', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@61edec1efbea1c02d71857e2aff9426d9cd2df4e', 'src/third_party/libyuv': - 'https://chromium.googlesource.com/libyuv/libyuv.git@a8c181050c202854ae32433164e6bd5d1e7c4368', + 'https://chromium.googlesource.com/libyuv/libyuv.git@93b1b332cd60b56ab90aea14182755e379c28a80', 'src/third_party/lss': { 'url': 'https://chromium.googlesource.com/linux-syscall-support.git@29f7c7e018f4ce706a709f0b0afbf8bacf869480', 'condition': 'checkout_android or checkout_linux', @@ -231,7 +231,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'p8MxOkeoVbwFeWnyTIOV5apfrUkcEo5Mq0bGVQtF82IC', + 'version': 'F8cKQoSai0fZxFRJVRZnoWeS-oVyp53L7bpuVq9t44AC', }, ], 'condition': 'checkout_android', @@ -256,14 +256,14 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/usrsctp/usrsctplib': - 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@6e00fe20dfd59a63e6b9060cfdfabeac860dbd1b', + 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@a6647318b57c0a05d590c8c21fc22aba87f08749', # Dependency used by libjpeg-turbo. 'src/third_party/yasm/binaries': { 'url': 'https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881', 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@6cf14f844290837f71af71da9332f1e3308a3434', + 'https://chromium.googlesource.com/chromium/src/tools@bd77bcca0dca8d01a7f66a1bee06f1989822ceff', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@a32a1607f6093d338f756c7e7c7b4333b0c50c9c', @@ -364,7 +364,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': '0cXqPd9UzaimlGKD6A5oVclporrOAC3RznyC7ICXQ9UC', + 'version': '09Q7fX-z4zxVsv_sl0K_cenKEZASVgwYe4goJB_KaIsC', }, ], 'condition': 'checkout_android', @@ -485,15 +485,15 @@ deps = { 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', - 'version': 'git_revision:fd10124659e991321df2f8a5d3749687b54ceb0a', + 'version': 'git_revision:77944aa535e42e29faadf6cfa81aee252807d468', }, { 'package': 'infra/tools/luci/isolated/${{platform}}', - 'version': 'git_revision:fd10124659e991321df2f8a5d3749687b54ceb0a', + 'version': 'git_revision:77944aa535e42e29faadf6cfa81aee252807d468', }, { 'package': 'infra/tools/luci/swarming/${{platform}}', - 'version': 'git_revision:fd10124659e991321df2f8a5d3749687b54ceb0a', + 'version': 'git_revision:77944aa535e42e29faadf6cfa81aee252807d468', }, ], 'dep_type': 'cipd', @@ -520,7 +520,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_core_common', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -531,7 +531,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_core_runtime', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -542,7 +542,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -553,7 +553,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common_java8', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -564,7 +564,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -575,7 +575,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata_core', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -586,7 +586,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -597,7 +597,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_viewmodel', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.1.1-cr0', }, ], 'condition': 'checkout_android', @@ -608,7 +608,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent', - 'version': 'version:3.1.cr0', + 'version': 'version:3.1-cr0', }, ], 'condition': 'checkout_android', @@ -619,7 +619,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/classworlds_classworlds', - 'version': 'version:1.1-alpha-2.cr0', + 'version': 'version:1.1-alpha-2-cr0', }, ], 'condition': 'checkout_android', @@ -630,7 +630,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_animated_vector_drawable', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -641,7 +641,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_appcompat_v7', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -652,7 +652,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_asynclayoutinflater', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -663,7 +663,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_cardview_v7', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -674,7 +674,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_collections', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -685,7 +685,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_coordinatorlayout', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -696,7 +696,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_cursoradapter', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -707,7 +707,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_customview', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -718,7 +718,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_design', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -729,7 +729,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_documentfile', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -740,7 +740,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_drawerlayout', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -751,7 +751,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_interpolator', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -762,7 +762,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_loader', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -773,7 +773,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_localbroadcastmanager', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -784,7 +784,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_multidex', - 'version': 'version:1.0.0.cr0', + 'version': 'version:1.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -795,7 +795,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_print', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -806,7 +806,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_recyclerview_v7', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -817,7 +817,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_slidingpanelayout', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -828,7 +828,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_annotations', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -839,7 +839,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_compat', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -850,7 +850,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_ui', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -861,7 +861,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_utils', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -872,7 +872,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_fragment', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -883,7 +883,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_media_compat', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -894,7 +894,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_v4', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -905,7 +905,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_vector_drawable', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -916,7 +916,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_swiperefreshlayout', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -927,7 +927,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_transition', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -938,7 +938,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_versionedparcelable', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -949,7 +949,29 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_viewpager', - 'version': 'version:28.0.0.cr0', + 'version': 'version:28.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_core', + 'version': 'version:1.0.0-beta08-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_processor': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_processor', + 'version': 'version:1.0.0-beta08-cr0', }, ], 'condition': 'checkout_android', @@ -960,7 +982,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.0.10-cr0', }, ], 'condition': 'checkout_android', @@ -971,7 +993,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration', - 'version': 'version:1.1.1.cr0', + 'version': 'version:1.0.10-cr0', }, ], 'condition': 'checkout_android', @@ -982,7 +1004,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.8.0-cr0', }, ], 'condition': 'checkout_android', @@ -993,7 +1015,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms', - 'version': 'version:1.0.cr0', + 'version': 'version:1.0-cr0', }, ], 'condition': 'checkout_android', @@ -1004,7 +1026,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_api', - 'version': 'version:2.2.1.cr0', + 'version': 'version:2.2.1-cr0', }, ], 'condition': 'checkout_android', @@ -1015,7 +1037,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1026,7 +1048,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', - 'version': 'version:17.5.0.cr0', + 'version': 'version:17.5.0-cr0', }, ], 'condition': 'checkout_android', @@ -1037,7 +1059,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1048,7 +1070,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base', - 'version': 'version:17.5.0.cr0', + 'version': 'version:17.5.0-cr0', }, ], 'condition': 'checkout_android', @@ -1059,7 +1081,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement', - 'version': 'version:17.5.0.cr0', + 'version': 'version:17.5.0-cr0', }, ], 'condition': 'checkout_android', @@ -1070,7 +1092,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1081,7 +1103,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1092,7 +1114,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut', - 'version': 'version:17.0.0.cr0', + 'version': 'version:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1103,7 +1125,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging', - 'version': 'version:16.0.0.cr0', + 'version': 'version:16.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1114,7 +1136,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido', - 'version': 'version:19.0.0-beta.cr0', + 'version': 'version:19.0.0-beta-cr0', }, ], 'condition': 'checkout_android', @@ -1125,7 +1147,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1136,7 +1158,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1147,7 +1169,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1158,7 +1180,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1169,7 +1191,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1180,7 +1202,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1191,7 +1213,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1202,7 +1224,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:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1213,7 +1235,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks', - 'version': 'version:17.2.0.cr0', + 'version': 'version:17.2.0-cr0', }, ], 'condition': 'checkout_android', @@ -1224,7 +1246,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:18.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1235,7 +1257,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:18.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1246,7 +1268,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', - 'version': 'version:1.2.0-alpha06.cr0', + 'version': 'version:1.2.0-alpha06-cr0', }, ], 'condition': 'checkout_android', @@ -1257,7 +1279,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_auto_auto_common', - 'version': 'version:0.10.cr0', + 'version': 'version:0.10-cr0', }, ], 'condition': 'checkout_android', @@ -1268,7 +1290,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service', - 'version': 'version:1.0-rc6.cr0', + 'version': 'version:1.0-rc6-cr0', }, ], 'condition': 'checkout_android', @@ -1279,7 +1301,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:1.0-rc6-cr0', }, ], 'condition': 'checkout_android', @@ -1290,18 +1312,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations', - 'version': 'version:1.7.cr0', + 'version': 'version: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:3.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1312,7 +1334,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', - 'version': 'version:3.0.2.cr0', + 'version': 'version:3.0.2-cr0', }, ], 'condition': 'checkout_android', @@ -1323,7 +1345,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', - 'version': 'version:2.8.0.cr0', + 'version': 'version:2.8.0-cr0', }, ], 'condition': 'checkout_android', @@ -1334,7 +1356,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', - 'version': 'version:2.30.cr0', + 'version': 'version:2.30-cr0', }, ], 'condition': 'checkout_android', @@ -1345,7 +1367,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler', - 'version': 'version:2.30.cr0', + 'version': 'version:2.30-cr0', }, ], 'condition': 'checkout_android', @@ -1356,7 +1378,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers', - 'version': 'version:2.30.cr0', + 'version': 'version:2.30-cr0', }, ], 'condition': 'checkout_android', @@ -1367,7 +1389,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi', - 'version': 'version:2.30.cr0', + 'version': 'version:2.30-cr0', }, ], 'condition': 'checkout_android', @@ -1378,7 +1400,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.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -1389,7 +1411,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.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -1400,7 +1422,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.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -1411,7 +1433,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.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -1422,7 +1444,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.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -1433,7 +1455,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac', - 'version': 'version:9+181-r4173-1.cr0', + 'version': 'version:9+181-r4173-1-cr0', }, ], 'condition': 'checkout_android', @@ -1444,7 +1466,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded', - 'version': 'version:9-dev-r4023-3.cr0', + 'version': 'version:9-dev-r4023-3-cr0', }, ], 'condition': 'checkout_android', @@ -1455,7 +1477,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_annotations', - 'version': 'version:16.0.0.cr0', + 'version': 'version:16.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1466,7 +1488,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common', - 'version': 'version:19.5.0.cr0', + 'version': 'version:19.5.0-cr0', }, ], 'condition': 'checkout_android', @@ -1477,7 +1499,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_components', - 'version': 'version:16.1.0.cr0', + 'version': 'version:16.1.0-cr0', }, ], 'condition': 'checkout_android', @@ -1488,7 +1510,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders', - 'version': 'version:16.1.0.cr0', + 'version': 'version:16.1.0-cr0', }, ], 'condition': 'checkout_android', @@ -1499,7 +1521,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json', - 'version': 'version:17.1.0.cr0', + 'version': 'version:17.1.0-cr0', }, ], 'condition': 'checkout_android', @@ -1510,7 +1532,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid', - 'version': 'version:21.0.1.cr0', + 'version': 'version:21.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -1521,7 +1543,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop', - 'version': 'version:17.0.0.cr0', + 'version': 'version:17.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1532,7 +1554,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations', - 'version': 'version:16.3.5.cr0', + 'version': 'version:16.3.5-cr0', }, ], 'condition': 'checkout_android', @@ -1543,7 +1565,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop', - 'version': 'version:16.0.1.cr0', + 'version': 'version:16.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -1554,7 +1576,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector', - 'version': 'version:18.0.0.cr0', + 'version': 'version:18.0.0-cr0', }, ], 'condition': 'checkout_android', @@ -1565,7 +1587,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_messaging', - 'version': 'version:21.0.1.cr0', + 'version': 'version:21.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -1576,7 +1598,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format', - 'version': 'version:1.5.cr0', + 'version': 'version:1.5-cr0', }, ], 'condition': 'checkout_android', @@ -1587,7 +1609,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess', - 'version': 'version:1.0.1.cr0', + 'version': 'version:1.0.1-cr0', }, ], 'condition': 'checkout_android', @@ -1598,7 +1620,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', - 'version': 'version:30.1-jre.cr0', + 'version': 'version:30.1-jre-cr0', }, ], 'condition': 'checkout_android', @@ -1609,7 +1631,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android', - 'version': 'version:30.1-android.cr0', + 'version': 'version:30.1-android-cr0', }, ], 'condition': 'checkout_android', @@ -1620,7 +1642,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_listenablefuture', - 'version': 'version:1.0.cr0', + 'version': 'version:1.0-cr0', }, ], 'condition': 'checkout_android', @@ -1631,7 +1653,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations', - 'version': 'version:1.3.cr0', + 'version': 'version:1.3-cr0', }, ], 'condition': 'checkout_android', @@ -1642,7 +1664,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java', - 'version': 'version:3.4.0.cr0', + 'version': 'version:3.4.0-cr0', }, ], 'condition': 'checkout_android', @@ -1653,7 +1675,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', - 'version': 'version:3.13.0.cr0', + 'version': 'version:3.13.0-cr0', }, ], 'condition': 'checkout_android', @@ -1664,7 +1686,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils', - 'version': 'version:1.3.0.cr0', + 'version': 'version:1.3.0-cr0', }, ], 'condition': 'checkout_android', @@ -1675,7 +1697,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', - 'version': 'version:1.13.0.cr0', + 'version': 'version:1.13.0-cr0', }, ], 'condition': 'checkout_android', @@ -1686,7 +1708,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter', - 'version': 'version:2.1.1.cr0', + 'version': 'version:2.1.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/commons_cli_commons_cli': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/commons_cli_commons_cli', + 'version': 'version:1.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -1697,7 +1730,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api', - 'version': 'version:1.3.2.cr0', + 'version': 'version:1.3.2-cr0', }, ], 'condition': 'checkout_android', @@ -1708,7 +1741,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', - 'version': 'version:1.0.cr0', + 'version': 'version:1.0-cr0', }, ], 'condition': 'checkout_android', @@ -1719,7 +1752,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject', - 'version': 'version:1.cr0', + 'version': 'version:1-cr0', }, ], 'condition': 'checkout_android', @@ -1730,18 +1763,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/nekohtml_nekohtml', - 'version': 'version:1.9.6.2.cr0', + 'version': 'version: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:1.9.6.2-cr0', }, ], 'condition': 'checkout_android', @@ -1752,7 +1785,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/net_ltgt_gradle_incap_incap', - 'version': 'version:0.2.cr0', + 'version': 'version:0.2-cr0', }, ], 'condition': 'checkout_android', @@ -1763,7 +1796,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/net_sf_kxml_kxml2', - 'version': 'version:2.3.0.cr0', + 'version': 'version:2.3.0-cr0', }, ], 'condition': 'checkout_android', @@ -1774,7 +1807,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant', - 'version': 'version:1.8.0.cr0', + 'version': 'version:1.8.0-cr0', }, ], 'condition': 'checkout_android', @@ -1785,7 +1818,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_apache_ant_ant_launcher', - 'version': 'version:1.8.0.cr0', + 'version': 'version:1.8.0-cr0', }, ], 'condition': 'checkout_android', @@ -1796,7 +1829,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.1.3-cr0', }, ], 'condition': 'checkout_android', @@ -1807,7 +1840,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.1-cr0', }, ], 'condition': 'checkout_android', @@ -1818,7 +1851,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.1-cr0', }, ], 'condition': 'checkout_android', @@ -1829,7 +1862,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.1-cr0', }, ], 'condition': 'checkout_android', @@ -1840,7 +1873,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.1-cr0', }, ], 'condition': 'checkout_android', @@ -1851,7 +1884,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.1-cr0', }, ], 'condition': 'checkout_android', @@ -1862,7 +1895,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.1-cr0', }, ], 'condition': 'checkout_android', @@ -1873,7 +1906,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.1-cr0', }, ], 'condition': 'checkout_android', @@ -1884,7 +1917,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.1-cr0', }, ], 'condition': 'checkout_android', @@ -1895,7 +1928,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.1-cr0', }, ], 'condition': 'checkout_android', @@ -1906,7 +1939,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:1.0-beta-6-cr0', }, ], 'condition': 'checkout_android', @@ -1917,7 +1950,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:1.0-beta-6-cr0', }, ], 'condition': 'checkout_android', @@ -1928,7 +1961,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:1.0-beta-6-cr0', }, ], 'condition': 'checkout_android', @@ -1939,7 +1972,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:1.0-beta-6-cr0', }, ], 'condition': 'checkout_android', @@ -1950,7 +1983,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup', - 'version': 'version:1.2.1.cr0', + 'version': 'version:1.2.1-cr0', }, ], 'condition': 'checkout_android', @@ -1961,7 +1994,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual', - 'version': 'version:2.5.5.cr0', + 'version': 'version:2.5.5-cr0', }, ], 'condition': 'checkout_android', @@ -1972,7 +2005,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', - 'version': 'version:3.5.0.cr0', + 'version': 'version:3.5.0-cr0', }, ], 'condition': 'checkout_android', @@ -1983,7 +2016,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_shaded', - 'version': 'version:3.1.2.cr0', + 'version': 'version:3.1.2-cr0', }, ], 'condition': 'checkout_android', @@ -1994,7 +2027,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', - 'version': 'version:1.17.cr0', + 'version': 'version:1.17-cr0', }, ], 'condition': 'checkout_android', @@ -2005,7 +2038,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:1.0-alpha-9-stable-1-cr0', }, ], 'condition': 'checkout_android', @@ -2016,7 +2049,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation', - 'version': 'version:1.11.cr0', + 'version': 'version:1.11-cr0', }, ], 'condition': 'checkout_android', @@ -2027,7 +2060,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils', - 'version': 'version:1.5.15.cr0', + 'version': 'version:1.5.15-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_jdom_jdom2': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jdom_jdom2', + 'version': 'version:2.0.6-cr0', }, ], 'condition': 'checkout_android', @@ -2038,7 +2082,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_annotations', - 'version': 'version:13.0.cr0', + 'version': 'version:13.0-cr0', }, ], 'condition': 'checkout_android', @@ -2049,7 +2093,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib', - 'version': 'version:1.3.72.cr0', + 'version': 'version:1.3.72-cr0', }, ], 'condition': 'checkout_android', @@ -2060,7 +2104,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common', - 'version': 'version:1.3.72.cr0', + 'version': 'version:1.3.72-cr0', }, ], 'condition': 'checkout_android', @@ -2071,7 +2115,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm', - 'version': 'version:0.1.0.cr0', + 'version': 'version:0.1.0-cr0', }, ], 'condition': 'checkout_android', @@ -2082,7 +2126,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm', - 'version': 'version:7.0.cr0', + 'version': 'version:7.0-cr0', }, ], 'condition': 'checkout_android', @@ -2093,7 +2137,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis', - 'version': 'version:7.0.cr0', + 'version': 'version:7.0-cr0', }, ], 'condition': 'checkout_android', @@ -2104,7 +2148,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons', - 'version': 'version:7.0.cr0', + 'version': 'version:7.0-cr0', }, ], 'condition': 'checkout_android', @@ -2115,7 +2159,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree', - 'version': 'version:7.0.cr0', + 'version': 'version:7.0-cr0', }, ], 'condition': 'checkout_android', @@ -2126,7 +2170,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util', - 'version': 'version:7.0.cr0', + 'version': 'version:7.0-cr0', }, ], 'condition': 'checkout_android', @@ -2137,7 +2181,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_pcollections_pcollections', - 'version': 'version:2.1.2.cr0', + 'version': 'version:2.1.2-cr0', }, ], 'condition': 'checkout_android', @@ -2148,7 +2192,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2159,7 +2203,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2170,7 +2214,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2181,7 +2225,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2192,7 +2236,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2203,7 +2247,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2214,7 +2258,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2225,7 +2269,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2236,7 +2280,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2247,7 +2291,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_playservices', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2258,7 +2302,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2269,7 +2313,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector', - 'version': 'version:4.3.1.cr0', + 'version': 'version:4.3.1-cr0', }, ], 'condition': 'checkout_android', @@ -2280,7 +2324,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_threeten_threeten_extra', - 'version': 'version:1.5.0.cr0', + 'version': 'version:1.5.0-cr0', }, ], 'condition': 'checkout_android',