From 80939356cc93d6885db7617c4bf3ec0bf7821c84 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 12 Apr 2021 19:03:37 +0200 Subject: [PATCH] Roll chromium_revision 34f3c82122..2dffe06711 (867171:871492) Change log: https://chromium.googlesource.com/chromium/src/+log/34f3c82122..2dffe06711 Full diff: https://chromium.googlesource.com/chromium/src/+/34f3c82122..2dffe06711 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/cbc66d2601..db151ac5c5 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/0cea8e20fb..399fa5ad74 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/99a2527e91..5dbd89c9d9 * src/buildtools/linux64: git_revision:b2e3d8622c1ce1bd853c7a11f62a739946669cdd..git_revision:dba01723a441c358d843a575cb7720d54ddcdf92 * src/buildtools/mac: git_revision:b2e3d8622c1ce1bd853c7a11f62a739946669cdd..git_revision:dba01723a441c358d843a575cb7720d54ddcdf92 * src/buildtools/third_party/libc++abi/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/cbf9455e83..d0f33885a2 * src/buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/cc80b4ac98..08f35c8514 * src/buildtools/win: git_revision:b2e3d8622c1ce1bd853c7a11f62a739946669cdd..git_revision:dba01723a441c358d843a575cb7720d54ddcdf92 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/b106ab6171..3ba3cf8e84 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/9511ad8751..85de9f3f89 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/d4a93a19d0..32fe4ba2c6 * src/third_party/android_deps/libs/android_arch_core_common: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/android_arch_core_runtime: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/android_arch_lifecycle_common: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/android_arch_lifecycle_common_java8: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/android_arch_lifecycle_livedata: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/android_arch_lifecycle_livedata_core: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/android_arch_lifecycle_runtime: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/android_arch_lifecycle_viewmodel: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent: version:3.1.cr0..version:2@3.1.cr0 * src/third_party/android_deps/libs/classworlds_classworlds: version:1.1-alpha-2.cr0..version:2@1.1-alpha-2.cr0 * src/third_party/android_deps/libs/com_android_support_animated_vector_drawable: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_appcompat_v7: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_asynclayoutinflater: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_cardview_v7: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_collections: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_coordinatorlayout: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_cursoradapter: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_customview: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_design: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_documentfile: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_drawerlayout: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_interpolator: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_loader: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_localbroadcastmanager: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_multidex: version:1.0.0.cr0..version:2@1.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_print: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_recyclerview_v7: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_slidingpanelayout: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_support_annotations: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_support_compat: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_support_core_ui: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_support_core_utils: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_support_fragment: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_support_media_compat: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_support_v4: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_support_vector_drawable: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_swiperefreshlayout: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_transition: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_versionedparcelable: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_support_viewpager: version:28.0.0.cr0..version:2@28.0.0.cr0 * src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration: version:1.1.1.cr0..version:2@1.1.1.cr0 * src/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine: version:2.8.0.cr0..version:2@2.8.0.cr0 * src/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms: version:1.0.cr0..version:2@1.0.cr0 * src/third_party/android_deps/libs/com_google_android_datatransport_transport_api: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_auth: version:17.0.0.cr0..version:2@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:2@17.5.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_base: version:17.5.0.cr0..version:2@17.5.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_basement: version:17.5.0.cr0..version:2@17.5.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_cast: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging: version:16.0.0.cr0..version:2@16.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_fido: version:19.0.0-beta.cr0..version:2@19.0.0-beta.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_flags: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_gcm: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_iid: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_location: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_stats: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_tasks: version:17.2.0.cr0..version:2@17.2.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_vision: version:18.0.0.cr0..version:2@18.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common: version:18.0.0.cr0..version:2@18.0.0.cr0 * src/third_party/android_deps/libs/com_google_android_material_material: version:1.2.0-alpha06.cr0..version:2@1.2.0-alpha06.cr0 * src/third_party/android_deps/libs/com_google_auto_auto_common: version:0.10.cr0..version:2@0.10.cr0 * src/third_party/android_deps/libs/com_google_auto_service_auto_service: version:1.0-rc6.cr0..version:2@1.0-rc6.cr0 * src/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations: version:1.0-rc6.cr0..version:2@1.0-rc6.cr0 * src/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations: version:1.7.cr0..version:2@1.7.cr0 * src/third_party/android_deps/libs/com_google_code_findbugs_jformatstring: version:3.0.0.cr0..version:2@3.0.0.cr0 * src/third_party/android_deps/libs/com_google_code_findbugs_jsr305: version:3.0.2.cr0..version:2@3.0.2.cr0 * src/third_party/android_deps/libs/com_google_code_gson_gson: version:2.8.0.cr0..version:2@2.8.0.cr0 * src/third_party/android_deps/libs/com_google_dagger_dagger: version:2.30.cr0..version:2@2.30.cr0 * src/third_party/android_deps/libs/com_google_dagger_dagger_compiler: version:2.30.cr0..version:2@2.30.cr0 * src/third_party/android_deps/libs/com_google_dagger_dagger_producers: version:2.30.cr0..version:2@2.30.cr0 * src/third_party/android_deps/libs/com_google_dagger_dagger_spi: version:2.30.cr0..version:2@2.30.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation: version:2.4.0.cr0..version:2@2.4.0.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations: version:2.4.0.cr0..version:2@2.4.0.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api: version:2.4.0.cr0..version:2@2.4.0.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_core: version:2.4.0.cr0..version:2@2.4.0.cr0 * src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations: version:2.4.0.cr0..version:2@2.4.0.cr0 * src/third_party/android_deps/libs/com_google_errorprone_javac: version:9+181-r4173-1.cr0..version:2@9+181-r4173-1.cr0 * src/third_party/android_deps/libs/com_google_errorprone_javac_shaded: version:9-dev-r4023-3.cr0..version:2@9-dev-r4023-3.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_annotations: version:16.0.0.cr0..version:2@16.0.0.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_common: version:19.5.0.cr0..version:2@19.5.0.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_components: version:16.1.0.cr0..version:2@16.1.0.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_encoders: version:16.1.0.cr0..version:2@16.1.0.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json: version:17.1.0.cr0..version:2@17.1.0.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_iid: version:21.0.1.cr0..version:2@21.0.1.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop: version:17.0.0.cr0..version:2@17.0.0.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_installations: version:16.3.5.cr0..version:2@16.3.5.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop: version:16.0.1.cr0..version:2@16.0.1.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector: version:18.0.0.cr0..version:2@18.0.0.cr0 * src/third_party/android_deps/libs/com_google_firebase_firebase_messaging: version:21.0.1.cr0..version:2@21.0.1.cr0 * src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format: version:1.5.cr0..version:2@1.5.cr0 * src/third_party/android_deps/libs/com_google_guava_failureaccess: version:1.0.1.cr0..version:2@1.0.1.cr0 * src/third_party/android_deps/libs/com_google_guava_guava: version:30.1-jre.cr0..version:2@30.1-jre.cr0 * src/third_party/android_deps/libs/com_google_guava_guava_android: version:30.1-android.cr0..version:2@30.1-android.cr0 * src/third_party/android_deps/libs/com_google_guava_listenablefuture: version:1.0.cr0..version:2@1.0.cr0 * src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations: version:1.3.cr0..version:2@1.3.cr0 * src/third_party/android_deps/libs/com_google_protobuf_protobuf_java: version:3.4.0.cr0..version:2@3.4.0.cr0 * src/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite: version:3.13.0.cr0..version:2@3.13.0.cr0 * src/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils: version:1.3.0.cr0..version:2@1.3.0.cr0 * src/third_party/android_deps/libs/com_squareup_javapoet: version:1.13.0.cr0..version:2@1.13.0.cr0 * src/third_party/android_deps/libs/com_squareup_javawriter: version:2.1.1.cr0..version:2@2.1.1.cr0 * src/third_party/android_deps/libs/javax_annotation_javax_annotation_api: version:1.3.2.cr0..version:2@1.3.2.cr0 * src/third_party/android_deps/libs/javax_annotation_jsr250_api: version:1.0.cr0..version:2@1.0.cr0 * src/third_party/android_deps/libs/javax_inject_javax_inject: version:1.cr0..version:2@1.cr0 * src/third_party/android_deps/libs/nekohtml_nekohtml: version:1.9.6.2.cr0..version:2@1.9.6.2.cr0 * src/third_party/android_deps/libs/nekohtml_xercesminimal: version:1.9.6.2.cr0..version:2@1.9.6.2.cr0 * src/third_party/android_deps/libs/net_ltgt_gradle_incap_incap: version:0.2.cr0..version:2@0.2.cr0 * src/third_party/android_deps/libs/net_sf_kxml_kxml2: version:2.3.0.cr0..version:2@2.3.0.cr0 * src/third_party/android_deps/libs/org_apache_ant_ant: version:1.8.0.cr0..version:2@1.8.0.cr0 * src/third_party/android_deps/libs/org_apache_ant_ant_launcher: version:1.8.0.cr0..version:2@1.8.0.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_ant_tasks: version:2.1.3.cr0..version:2@2.1.3.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_artifact: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_artifact_manager: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_error_diagnostics: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_model: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_plugin_registry: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_profile: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_project: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_repository_metadata: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/org_apache_maven_maven_settings: version:2.2.1.cr0..version:2@2.2.1.cr0 * src/third_party/android_deps/libs/org_apache_maven_wagon_wagon_file: version:1.0-beta-6.cr0..version:2@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:2@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:2@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:2@1.0-beta-6.cr0 * src/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup: version:1.2.1.cr0..version:2@1.2.1.cr0 * src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual: version:2.5.5.cr0..version:2@2.5.5.cr0 * src/third_party/android_deps/libs/org_checkerframework_checker_qual: version:3.5.0.cr0..version:2@3.5.0.cr0 * src/third_party/android_deps/libs/org_checkerframework_dataflow_shaded: version:3.1.2.cr0..version:2@3.1.2.cr0 * src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations: version:1.17.cr0..version:2@1.17.cr0 * src/third_party/android_deps/libs/org_codehaus_plexus_plexus_container_default: version:1.0-alpha-9-stable-1.cr0..version:2@1.0-alpha-9-stable-1.cr0 * src/third_party/android_deps/libs/org_codehaus_plexus_plexus_interpolation: version:1.11.cr0..version:2@1.11.cr0 * src/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils: version:1.5.15.cr0..version:2@1.5.15.cr0 * src/third_party/android_deps/libs/org_jetbrains_annotations: version:13.0.cr0..version:2@13.0.cr0 * src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib: version:1.3.72.cr0..version:2@1.4.30.cr0 * src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common: version:1.3.72.cr0..version:2@1.4.30.cr0 * src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm: version:0.1.0.cr0..version:2@0.1.0.cr0 * src/third_party/android_deps/libs/org_ow2_asm_asm: version:7.0.cr0..version:2@7.0.cr0 * src/third_party/android_deps/libs/org_ow2_asm_asm_analysis: version:7.0.cr0..version:2@7.0.cr0 * src/third_party/android_deps/libs/org_ow2_asm_asm_commons: version:7.0.cr0..version:2@7.0.cr0 * src/third_party/android_deps/libs/org_ow2_asm_asm_tree: version:7.0.cr0..version:2@7.0.cr0 * src/third_party/android_deps/libs/org_ow2_asm_asm_util: version:7.0.cr0..version:2@7.0.cr0 * src/third_party/android_deps/libs/org_pcollections_pcollections: version:2.1.2.cr0..version:2@2.1.2.cr0 * src/third_party/android_deps/libs/org_robolectric_annotations: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_junit: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_pluginapi: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_resources: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_robolectric: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_sandbox: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_shadowapi: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_shadows_framework: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_shadows_playservices: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_utils: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_robolectric_utils_reflector: version:4.3.1.cr0..version:2@4.3.1.cr0 * src/third_party/android_deps/libs/org_threeten_threeten_extra: version:1.5.0.cr0..version:2@1.5.0.cr0 * src/third_party/androidx: v-p1zbJ800vLETiv98_a04Og1z_1IR6Cph3aB-RvpO0C..elLOzilYbu3vB2mpMZzZsC0i9QukqoU9miZ_PUmpeE8C * src/third_party/breakpad/breakpad: https://chromium.googlesource.com/breakpad/breakpad.git/+log/dff7d5afd5..3bea2815bf * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/36e45025a8..ab687ea7be * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/e0de6a88e5..057831ef1f * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/104674b531..4fb42ae52e * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/e9c50fa77d..b9b74f9f78 * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/1a8ecf1813..965f8ecbfd * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/d879aac971..81d656878e * src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/79b7757996..6c93db7ff6 * src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/a8c181050c..64994843e6 * src/third_party/lss: https://chromium.googlesource.com/linux-syscall-support.git/+log/29f7c7e018..92a65a8f5d * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/acb2e677b4..9511660f93 * src/third_party/r8: TNGssqzExjlZ_AG4P92Hje4YYbM8o_TMSLQeRxrAB-8C..wupRO-hEg2hxgKU9FC5HKY88dMpfEpdimjxcgekXH8oC * src/third_party/usrsctp/usrsctplib: https://chromium.googlesource.com/external/github.com/sctplab/usrsctp/+log/79f0178cd3..70d42ae95a * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/add6c82864..78b6ac0da4 * src/tools/luci-go: git_revision:40e3c704aad0fceec04344d281ae333de04fd2a5..git_revision:f784260b204b2d93c7bd6d1a619f09c6822e5926 * src/tools/luci-go: git_revision:40e3c704aad0fceec04344d281ae333de04fd2a5..git_revision:f784260b204b2d93c7bd6d1a619f09c6822e5926 * src/tools/luci-go: git_revision:40e3c704aad0fceec04344d281ae333de04fd2a5..git_revision:f784260b204b2d93c7bd6d1a619f09c6822e5926 Added dependencies * src/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api * src/third_party/android_deps/libs/com_android_tools_sdk_common * src/third_party/android_deps/libs/com_android_tools_common DEPS diff: https://chromium.googlesource.com/chromium/src/+/34f3c82122..2dffe06711/DEPS Clang version changed llvmorg-13-init-4720-g7bafe336:llvmorg-13-init-6429-g0e92cbd6 Details: https://chromium.googlesource.com/chromium/src/+/34f3c82122..2dffe06711/tools/clang/scripts/update.py TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com, BUG=None Change-Id: I3b3a469e48383e250adaf46b186d5cad038957a6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215021 Reviewed-by: Mirko Bonadei Reviewed-by: Autoroller Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#33696} --- DEPS | 415 +++++++++++++++++-------------- build_overrides/build.gni | 7 + test/android/AndroidManifest.xml | 2 +- webrtc.gni | 5 +- 4 files changed, 236 insertions(+), 193 deletions(-) diff --git a/DEPS b/DEPS index d0ea162f33..f05763034b 100644 --- a/DEPS +++ b/DEPS @@ -7,37 +7,37 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': '34f3c82122ca210ae29b7fc3c5e043db5107d12c', + 'chromium_revision': '2dffe06711fa40df6ab333364bbb305f0ac45268', } 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@cbc66d26010d8cbf3ae2e877de74539c39267ef9', + 'https://chromium.googlesource.com/chromium/src/base@db151ac5c55867ad4b7d9a83f1265afa3e8b2a70', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@0cea8e20fb5e82291e64d665bf5449446b49594d', + 'https://chromium.googlesource.com/chromium/src/build@399fa5ad74ba6ba84402f01fe66911b2295c3f14', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@99a2527e919b496f3d2849c77c5bbed4bdccd5a4', + 'https://chromium.googlesource.com/chromium/src/buildtools@5dbd89c9d9c0b0ff47cefdc2bc421b8c9a1c5a21', # 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@b106ab6171dc2ca7869a11ecbe2e0a6bab8210d2', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@3ba3cf8e84b58cbd907aea6cbc14759921c78548', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@9511ad8751d765b0f1b27c9a7be11e5635e5a287', + 'https://chromium.googlesource.com/chromium/src/testing@85de9f3f89b67c0e4a68f67bbe6937dcbd91477c', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@d4a93a19d0ac19314e5dafc10a13aadde2ba0c2e', + 'https://chromium.googlesource.com/chromium/src/third_party@32fe4ba2c61ea01e725acbdd944f2f0468fbd131', 'src/buildtools/linux64': { 'packages': [ { 'package': 'gn/gn/linux-amd64', - 'version': 'git_revision:b2e3d8622c1ce1bd853c7a11f62a739946669cdd', + 'version': 'git_revision:dba01723a441c358d843a575cb7720d54ddcdf92', } ], 'dep_type': 'cipd', @@ -47,7 +47,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/mac-${{arch}}', - 'version': 'git_revision:b2e3d8622c1ce1bd853c7a11f62a739946669cdd', + 'version': 'git_revision:dba01723a441c358d843a575cb7720d54ddcdf92', } ], 'dep_type': 'cipd', @@ -57,7 +57,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/windows-amd64', - 'version': 'git_revision:b2e3d8622c1ce1bd853c7a11f62a739946669cdd', + 'version': 'git_revision:dba01723a441c358d843a575cb7720d54ddcdf92', } ], 'dep_type': 'cipd', @@ -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@cbf9455e837f39dac89f9e3365692e9251019d4e', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@d0f33885a2ffa7d5af74af6065b60eb48e3c70f5', '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@08f35c8514a74817103121def05351186830d4b7', 'src/tools/clang/dsymutil': { 'packages': [ @@ -120,18 +120,18 @@ deps = { 'src/third_party/boringssl/src': 'https://boringssl.googlesource.com/boringssl.git@49f0329110a1d93a5febc2bceceedc655d995420', 'src/third_party/breakpad/breakpad': - 'https://chromium.googlesource.com/breakpad/breakpad.git@dff7d5afd51d7e831c44faf30f45f2d2ca02575b', + 'https://chromium.googlesource.com/breakpad/breakpad.git@3bea2815bfea6e641d50aad15bde2c494ef8f34b', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@36e45025a81ac877509a444ce80a04f57544f50b', + 'https://chromium.googlesource.com/catapult.git@ab687ea7be643e0f78176a60f3797aae7fbbae46', '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@e0de6a88e5385ee9cd38d5e87f97456bbad8e7d2', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@057831ef1f149883e3c26f58a867663f78dc49e1', 'src/third_party/ffmpeg': - 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@104674b531fb4e110e3f96be5e656331435deec5', + 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@4fb42ae52e7327469281d612784dd9d0e066d5ed', 'src/third_party/findbugs': { 'url': 'https://chromium.googlesource.com/chromium/deps/findbugs.git@4275d9ac8610db6b1bc9a5e887f97e41b33fac67', 'condition': 'checkout_android', @@ -142,7 +142,7 @@ deps = { 'condition': 'checkout_linux', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@e9c50fa77de58b749b4b95706f7b55bfff0dd27f', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@b9b74f9f78565513086050acdda98ddc23cf605e', 'src/third_party/harfbuzz-ng/src': 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@4c34478b28497acfce02b8a544fed4ae20526336', 'src/third_party/google_benchmark/src': { @@ -162,9 +162,9 @@ deps = { 'dep_type': 'cipd', }, 'src/third_party/googletest/src': - 'https://chromium.googlesource.com/external/github.com/google/googletest.git@1a8ecf1813d022cc7914e04564b92decff6161fc', + 'https://chromium.googlesource.com/external/github.com/google/googletest.git@965f8ecbfd8b91bbd4f5ee4914c028660bb89029', 'src/third_party/icu': { - 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@d879aac9717d15679125cfe8c26b482006f107f3', + 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@81d656878ec611cb0b42d52c82e9dae93920d9ba', }, 'src/third_party/jdk': { 'packages': [ @@ -200,19 +200,19 @@ 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@79b775799699eb00b7d65e9b8892bde1094ae91e', + 'https://aomedia.googlesource.com/aom.git@6c93db7ff63430d2e5dcdfc42e84e3a0514da608', 'src/third_party/libunwindstack': { 'url': 'https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git@aab2c874731396232739889ebe8d9e122b9bc448', 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@acb2e677b426b56b2a6c8a82b5e273aa11916666', + 'https://android.googlesource.com/platform/external/perfetto.git@9511660f9320b7dea169f39d88d81f4457886325', '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@64994843e652443df2d5201c6ae3fb725097360f', 'src/third_party/lss': { - 'url': 'https://chromium.googlesource.com/linux-syscall-support.git@29f7c7e018f4ce706a709f0b0afbf8bacf869480', + 'url': 'https://chromium.googlesource.com/linux-syscall-support.git@92a65a8f5d705d1928874420c8d0d15bde8c89e5', 'condition': 'checkout_android or checkout_linux', }, 'src/third_party/mockito/src': { @@ -231,7 +231,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'TNGssqzExjlZ_AG4P92Hje4YYbM8o_TMSLQeRxrAB-8C', + 'version': 'wupRO-hEg2hxgKU9FC5HKY88dMpfEpdimjxcgekXH8oC', }, ], '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@79f0178cd3cf327cc8721cee15609269964ef81a', + 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@70d42ae95a1de83bd317c8cc9503f894671d1392', # 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@add6c828642f0e0a43dedafbfc3cbccaa8ade0db', + 'https://chromium.googlesource.com/chromium/src/tools@78b6ac0da44525a643348ce6f04f703a5dbe1973', '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': 'v-p1zbJ800vLETiv98_a04Og1z_1IR6Cph3aB-RvpO0C', + 'version': 'elLOzilYbu3vB2mpMZzZsC0i9QukqoU9miZ_PUmpeE8C', }, ], 'condition': 'checkout_android', @@ -485,15 +485,15 @@ deps = { 'packages': [ { 'package': 'infra/tools/luci/isolate/${{platform}}', - 'version': 'git_revision:40e3c704aad0fceec04344d281ae333de04fd2a5', + 'version': 'git_revision:f784260b204b2d93c7bd6d1a619f09c6822e5926', }, { 'package': 'infra/tools/luci/isolated/${{platform}}', - 'version': 'git_revision:40e3c704aad0fceec04344d281ae333de04fd2a5', + 'version': 'git_revision:f784260b204b2d93c7bd6d1a619f09c6822e5926', }, { 'package': 'infra/tools/luci/swarming/${{platform}}', - 'version': 'git_revision:40e3c704aad0fceec04344d281ae333de04fd2a5', + 'version': 'git_revision:f784260b204b2d93c7bd6d1a619f09c6822e5926', }, ], '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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@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:2@28.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -949,7 +949,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_viewpager', - 'version': 'version:28.0.0.cr0', + 'version': 'version:2@28.0.0.cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_android_tools_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_common', + 'version': 'version:2@30.0.0-alpha10.cr0', }, ], 'condition': 'checkout_android', @@ -960,7 +971,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs', - 'version': 'version:1.1.1.cr0', + 'version': 'version:2@1.1.1.cr0', }, ], 'condition': 'checkout_android', @@ -971,7 +982,29 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration', - 'version': 'version:1.1.1.cr0', + 'version': 'version:2@1.1.1.cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/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', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_android_tools_sdk_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_android_tools_sdk_common', + 'version': 'version:2@30.0.0-alpha10.cr0', }, ], 'condition': 'checkout_android', @@ -982,7 +1015,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine', - 'version': 'version:2.8.0.cr0', + 'version': 'version:2@2.8.0.cr0', }, ], 'condition': 'checkout_android', @@ -993,7 +1026,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms', - 'version': 'version:1.0.cr0', + 'version': 'version:2@1.0.cr0', }, ], 'condition': 'checkout_android', @@ -1004,7 +1037,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.2.1.cr0', }, ], 'condition': 'checkout_android', @@ -1015,7 +1048,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1026,7 +1059,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:2@17.5.0.cr0', }, ], 'condition': 'checkout_android', @@ -1037,7 +1070,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1048,7 +1081,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:2@17.5.0.cr0', }, ], 'condition': 'checkout_android', @@ -1059,7 +1092,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:2@17.5.0.cr0', }, ], 'condition': 'checkout_android', @@ -1070,7 +1103,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1081,7 +1114,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1092,7 +1125,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:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1103,7 +1136,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:2@16.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1114,7 +1147,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:2@19.0.0-beta.cr0', }, ], 'condition': 'checkout_android', @@ -1125,7 +1158,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1136,7 +1169,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1147,7 +1180,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1158,7 +1191,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1169,7 +1202,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1180,7 +1213,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1191,7 +1224,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1202,7 +1235,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1213,7 +1246,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:2@17.2.0.cr0', }, ], 'condition': 'checkout_android', @@ -1224,7 +1257,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision', - 'version': 'version:18.0.0.cr0', + 'version': 'version:2@18.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1235,7 +1268,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common', - 'version': 'version:18.0.0.cr0', + 'version': 'version:2@18.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1246,7 +1279,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', - 'version': 'version:1.2.0-alpha06.cr0', + 'version': 'version:2@1.2.0-alpha06.cr0', }, ], 'condition': 'checkout_android', @@ -1257,7 +1290,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_auto_auto_common', - 'version': 'version:0.10.cr0', + 'version': 'version:2@0.10.cr0', }, ], 'condition': 'checkout_android', @@ -1268,7 +1301,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service', - 'version': 'version:1.0-rc6.cr0', + 'version': 'version:2@1.0-rc6.cr0', }, ], 'condition': 'checkout_android', @@ -1279,7 +1312,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations', - 'version': 'version:1.0-rc6.cr0', + 'version': 'version:2@1.0-rc6.cr0', }, ], 'condition': 'checkout_android', @@ -1290,7 +1323,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations', - 'version': 'version:1.7.cr0', + 'version': 'version:2@1.7.cr0', }, ], 'condition': 'checkout_android', @@ -1301,7 +1334,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jformatstring', - 'version': 'version:3.0.0.cr0', + 'version': 'version:2@3.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1312,7 +1345,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', - 'version': 'version:3.0.2.cr0', + 'version': 'version:2@3.0.2.cr0', }, ], 'condition': 'checkout_android', @@ -1323,7 +1356,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', - 'version': 'version:2.8.0.cr0', + 'version': 'version:2@2.8.0.cr0', }, ], 'condition': 'checkout_android', @@ -1334,7 +1367,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', - 'version': 'version:2.30.cr0', + 'version': 'version:2@2.30.cr0', }, ], 'condition': 'checkout_android', @@ -1345,7 +1378,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler', - 'version': 'version:2.30.cr0', + 'version': 'version:2@2.30.cr0', }, ], 'condition': 'checkout_android', @@ -1356,7 +1389,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers', - 'version': 'version:2.30.cr0', + 'version': 'version:2@2.30.cr0', }, ], 'condition': 'checkout_android', @@ -1367,7 +1400,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi', - 'version': 'version:2.30.cr0', + 'version': 'version:2@2.30.cr0', }, ], 'condition': 'checkout_android', @@ -1378,7 +1411,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation', - 'version': 'version:2.4.0.cr0', + 'version': 'version:2@2.4.0.cr0', }, ], 'condition': 'checkout_android', @@ -1389,7 +1422,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', - 'version': 'version:2.4.0.cr0', + 'version': 'version:2@2.4.0.cr0', }, ], 'condition': 'checkout_android', @@ -1400,7 +1433,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api', - 'version': 'version:2.4.0.cr0', + 'version': 'version:2@2.4.0.cr0', }, ], 'condition': 'checkout_android', @@ -1411,7 +1444,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core', - 'version': 'version:2.4.0.cr0', + 'version': 'version:2@2.4.0.cr0', }, ], 'condition': 'checkout_android', @@ -1422,7 +1455,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations', - 'version': 'version:2.4.0.cr0', + 'version': 'version:2@2.4.0.cr0', }, ], 'condition': 'checkout_android', @@ -1433,7 +1466,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac', - 'version': 'version:9+181-r4173-1.cr0', + 'version': 'version:2@9+181-r4173-1.cr0', }, ], 'condition': 'checkout_android', @@ -1444,7 +1477,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded', - 'version': 'version:9-dev-r4023-3.cr0', + 'version': 'version:2@9-dev-r4023-3.cr0', }, ], 'condition': 'checkout_android', @@ -1455,7 +1488,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_annotations', - 'version': 'version:16.0.0.cr0', + 'version': 'version:2@16.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1466,7 +1499,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common', - 'version': 'version:19.5.0.cr0', + 'version': 'version:2@19.5.0.cr0', }, ], 'condition': 'checkout_android', @@ -1477,7 +1510,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_components', - 'version': 'version:16.1.0.cr0', + 'version': 'version:2@16.1.0.cr0', }, ], 'condition': 'checkout_android', @@ -1488,7 +1521,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders', - 'version': 'version:16.1.0.cr0', + 'version': 'version:2@16.1.0.cr0', }, ], 'condition': 'checkout_android', @@ -1499,7 +1532,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json', - 'version': 'version:17.1.0.cr0', + 'version': 'version:2@17.1.0.cr0', }, ], 'condition': 'checkout_android', @@ -1510,7 +1543,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid', - 'version': 'version:21.0.1.cr0', + 'version': 'version:2@21.0.1.cr0', }, ], 'condition': 'checkout_android', @@ -1521,7 +1554,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop', - 'version': 'version:17.0.0.cr0', + 'version': 'version:2@17.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1532,7 +1565,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations', - 'version': 'version:16.3.5.cr0', + 'version': 'version:2@16.3.5.cr0', }, ], 'condition': 'checkout_android', @@ -1543,7 +1576,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop', - 'version': 'version:16.0.1.cr0', + 'version': 'version:2@16.0.1.cr0', }, ], 'condition': 'checkout_android', @@ -1554,7 +1587,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector', - 'version': 'version:18.0.0.cr0', + 'version': 'version:2@18.0.0.cr0', }, ], 'condition': 'checkout_android', @@ -1565,7 +1598,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_messaging', - 'version': 'version:21.0.1.cr0', + 'version': 'version:2@21.0.1.cr0', }, ], 'condition': 'checkout_android', @@ -1576,7 +1609,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format', - 'version': 'version:1.5.cr0', + 'version': 'version:2@1.5.cr0', }, ], 'condition': 'checkout_android', @@ -1587,7 +1620,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess', - 'version': 'version:1.0.1.cr0', + 'version': 'version:2@1.0.1.cr0', }, ], 'condition': 'checkout_android', @@ -1598,7 +1631,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', - 'version': 'version:30.1-jre.cr0', + 'version': 'version:2@30.1-jre.cr0', }, ], 'condition': 'checkout_android', @@ -1609,7 +1642,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android', - 'version': 'version:30.1-android.cr0', + 'version': 'version:2@30.1-android.cr0', }, ], 'condition': 'checkout_android', @@ -1620,7 +1653,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_listenablefuture', - 'version': 'version:1.0.cr0', + 'version': 'version:2@1.0.cr0', }, ], 'condition': 'checkout_android', @@ -1631,7 +1664,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations', - 'version': 'version:1.3.cr0', + 'version': 'version:2@1.3.cr0', }, ], 'condition': 'checkout_android', @@ -1642,7 +1675,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java', - 'version': 'version:3.4.0.cr0', + 'version': 'version:2@3.4.0.cr0', }, ], 'condition': 'checkout_android', @@ -1653,7 +1686,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', - 'version': 'version:3.13.0.cr0', + 'version': 'version:2@3.13.0.cr0', }, ], 'condition': 'checkout_android', @@ -1664,7 +1697,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils', - 'version': 'version:1.3.0.cr0', + 'version': 'version:2@1.3.0.cr0', }, ], 'condition': 'checkout_android', @@ -1675,7 +1708,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', - 'version': 'version:1.13.0.cr0', + 'version': 'version:2@1.13.0.cr0', }, ], 'condition': 'checkout_android', @@ -1686,7 +1719,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter', - 'version': 'version:2.1.1.cr0', + 'version': 'version:2@2.1.1.cr0', }, ], 'condition': 'checkout_android', @@ -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:2@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:2@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:2@1.cr0', }, ], 'condition': 'checkout_android', @@ -1730,7 +1763,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/nekohtml_nekohtml', - 'version': 'version:1.9.6.2.cr0', + 'version': 'version:2@1.9.6.2.cr0', }, ], 'condition': 'checkout_android', @@ -1741,7 +1774,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/nekohtml_xercesminimal', - 'version': 'version:1.9.6.2.cr0', + 'version': 'version:2@1.9.6.2.cr0', }, ], 'condition': 'checkout_android', @@ -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:2@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@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:2@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:2@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@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.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.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.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.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.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.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.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.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.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:2@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:2@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:2@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:2@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:2@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@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:2@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:2@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:2@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:2@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:2@1.11.cr0', }, ], 'condition': 'checkout_android', @@ -2027,7 +2060,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_codehaus_plexus_plexus_utils', - 'version': 'version:1.5.15.cr0', + 'version': 'version:2@1.5.15.cr0', }, ], 'condition': 'checkout_android', @@ -2038,7 +2071,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_annotations', - 'version': 'version:13.0.cr0', + 'version': 'version:2@13.0.cr0', }, ], 'condition': 'checkout_android', @@ -2049,7 +2082,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib', - 'version': 'version:1.3.72.cr0', + 'version': 'version:2@1.4.30.cr0', }, ], 'condition': 'checkout_android', @@ -2060,7 +2093,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common', - 'version': 'version:1.3.72.cr0', + 'version': 'version:2@1.4.30.cr0', }, ], 'condition': 'checkout_android', @@ -2071,7 +2104,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm', - 'version': 'version:0.1.0.cr0', + 'version': 'version:2@0.1.0.cr0', }, ], 'condition': 'checkout_android', @@ -2082,7 +2115,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm', - 'version': 'version:7.0.cr0', + 'version': 'version:2@7.0.cr0', }, ], 'condition': 'checkout_android', @@ -2093,7 +2126,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis', - 'version': 'version:7.0.cr0', + 'version': 'version:2@7.0.cr0', }, ], 'condition': 'checkout_android', @@ -2104,7 +2137,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons', - 'version': 'version:7.0.cr0', + 'version': 'version:2@7.0.cr0', }, ], 'condition': 'checkout_android', @@ -2115,7 +2148,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree', - 'version': 'version:7.0.cr0', + 'version': 'version:2@7.0.cr0', }, ], 'condition': 'checkout_android', @@ -2126,7 +2159,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util', - 'version': 'version:7.0.cr0', + 'version': 'version:2@7.0.cr0', }, ], 'condition': 'checkout_android', @@ -2137,7 +2170,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_pcollections_pcollections', - 'version': 'version:2.1.2.cr0', + 'version': 'version:2@2.1.2.cr0', }, ], 'condition': 'checkout_android', @@ -2148,7 +2181,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2159,7 +2192,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2170,7 +2203,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2181,7 +2214,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2192,7 +2225,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2203,7 +2236,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2214,7 +2247,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2225,7 +2258,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2236,7 +2269,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2247,7 +2280,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_playservices', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2258,7 +2291,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2269,7 +2302,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector', - 'version': 'version:4.3.1.cr0', + 'version': 'version:2@4.3.1.cr0', }, ], 'condition': 'checkout_android', @@ -2280,7 +2313,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_threeten_threeten_extra', - 'version': 'version:1.5.0.cr0', + 'version': 'version:2@1.5.0.cr0', }, ], 'condition': 'checkout_android', diff --git a/build_overrides/build.gni b/build_overrides/build.gni index 7984a55ad9..c21069535b 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -52,6 +52,13 @@ declare_args() { enable_base_tracing = false use_perfetto_client_library = false + # Limits the defined //third_party/android_deps targets to only "buildCompile" + # and "buildCompileNoDeps" targets. This is useful for third-party + # repositories which do not use JUnit tests. For instance, + # limit_android_deps == true removes "gn gen" requirement for + # //third_party/robolectric . + limit_android_deps = false + # If true, it assumes that //third_party/abseil-cpp is an available # dependency for googletest. gtest_enable_absl_printers = true diff --git a/test/android/AndroidManifest.xml b/test/android/AndroidManifest.xml index ee2fec8716..ad3f434b4f 100644 --- a/test/android/AndroidManifest.xml +++ b/test/android/AndroidManifest.xml @@ -39,7 +39,7 @@ be found in the AUTHORS file in the root of the source tree. - diff --git a/webrtc.gni b/webrtc.gni index b70cba633a..6c80d721f4 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -471,7 +471,10 @@ template("rtc_test") { android_manifest = webrtc_root + "test/android/AndroidManifest.xml" min_sdk_version = 21 target_sdk_version = 23 - deps += [ webrtc_root + "test:native_test_java" ] + deps += [ + "//build/android/gtest_apk:native_test_instrumentation_test_runner_java", + webrtc_root + "test:native_test_java", + ] } # When not targeting a simulator, building //base/test:google_test_runner