From 80d19e4906bc05b1a1ab2d3a081ec61768ffee7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Tue, 7 Jan 2025 13:49:21 +0100 Subject: [PATCH] Roll chromium_revision af3d01376b..f2539aa88a (1174635:1398488) NOTE: The revision range is not quite correct due to the large number of manual changes. * Update third_party/android_sdk/public/ packages in DEPS * Update DEPS to cipd as required * Add support for 'non_git_source' * Update third_party/instrumented_libs * Remove "terminal".qemu-x64 fuchsia boot image * Use a normal dependency on clang-format instead of pulling based on hashes * Add re2 and llvm libc to DEPS * Remove dependency on //testing/android/native_test:native_test_native_code (this is to avoid getting an indirect dependency on rust through //base.) * Add buildtools and third_party/instrumented_libs to recursedeps * Allow for mac cross compile on linux Change log: https://chromium.googlesource.com/chromium/src/+log/af3d01376b..f2539aa88a Full diff: https://chromium.googlesource.com/chromium/src/+/af3d01376b..f2539aa88a Changed dependencies * fuchsia_vesion: version:15.20230909.2.1..version:26.20241213.3.1 * gn_vesion: git_revision:fae280eabe5d31accc53100137459ece19a7a295..git_revision:c97a86a72105f3328a540f5a5ab17d11989ab7dd * ninja_vesion: version:2@1.11.1.chromium.6..version:3@1.12.1.chromium.4 * reclient_vesion: re_client_version:0.110.0.43ec6b1-gomaip..re_client_version:0.172.0.3cf60ba5-gomaip * src/base: https://chromium.googlesource.com/chromium/src/base/+log/d407b7061b..aefc825509 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/5885d3c248..1923aa3e32 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/79ab87fa54..b8ff6f5a95 * src/buildtools/linux64: git_revision:fae280eabe5d31accc53100137459ece19a7a295..git_revision:c97a86a72105f3328a540f5a5ab17d11989ab7dd * src/buildtools/mac: git_revision:fae280eabe5d31accc53100137459ece19a7a295..git_revision:c97a86a72105f3328a540f5a5ab17d11989ab7dd * src/buildtools/reclient: re_client_version:0.110.0.43ec6b1-gomaip..re_client_version:0.172.0.3cf60ba5-gomaip * src/buildtools/win: git_revision:fae280eabe5d31accc53100137459ece19a7a295..git_revision:c97a86a72105f3328a540f5a5ab17d11989ab7dd * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/ddd58e86cf..15caecbcad * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/51e9a02297..0305a85a20 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/2dc4b18abd..d9ea6d4e7d * src/third_party/androidx/cipd: jiSw6hD706772Ci0lovUctvq0azknqPQ5bXgSdeLRLoC..UgU67e5iHzB2He0pnVLopdT8E6Z-vYa65s2LUhagBfoC * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/20a06474c0..c361e27940 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/fa05d995e1..e7c18388ac * src/third_party/clang-format/script: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git/+log/f97059df7f..37f6e68a10 * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/d3e43dd431..fcb6178914 * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/9e3c5d7e18..38272bf853 * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/af29db7ec2..f3c355f9dd * src/third_party/harfbuzz-ng/src: https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/db700b5670..1c249be96e * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/e8c3bc9ea9..bbccc2f6ef * src/third_party/junit/src: https://chromium.googlesource.com/external/junit.git/+log/05fe2a64f5..0eb5ce7284 * src/third_party/kotlin_stdlib/cipd: VqqnQS2oBxM8b3Q7CDJaGfa-QQoOPx9weNRX1avHGNoC..GjL64HceCa9uCZWJ1u-a174ay-7m1EZTupVwLzzxbrEC * src/third_party/libc++/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/84fb809dd6..d0ddad5b79 * src/third_party/libc++abi/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/8d21803b90..02cb512292 * src/third_party/libjpeg_turbo: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git/+log/30bdb85e30..927aabfcd2 * src/third_party/libunwind/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/f1c687e0aa..d1e95b102f * src/third_party/libunwindstack: https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git/+log/4dbfa0e8c8..215bddfd8e * src/third_party/nasm: https://chromium.googlesource.com/chromium/deps/nasm.git/+log/7fc833e889..f477acb104 * src/third_party/ninja: version:2@1.11.1.chromium.6..version:3@1.12.1.chromium.4 * src/third_party/r8/cipd: jnP8YjPJaWAXthtBv-bT_5HD3c6ywpAmGL31ZURB3fgC..q_wvk54XItTBlBNQMHkS4NRMp-tapPW97M292KTXHrsC * src/third_party/r8/d8/cipd: o7pbwAFk68RQBPYLlCUm0mQ6B3Bj9pykXOPvv8akR5kC..q_wvk54XItTBlBNQMHkS4NRMp-tapPW97M292KTXHrsC * src/third_party/robolectric/cipd: Y1B0M_fCpPZ058xErMX6GQOJEVRBWR342juuxNLpVnkC..G3VkWqTv1YWDvC6zCrL34iQREzrzdBmSL4GMboAIiAEC * src/third_party/turbine/cipd: c4onccFJcd8rKHM_6js-X_ucjXdFqhDWK8aUX4ARSkkC..dz8pRLjwNlToJ0tS14T-TDQJNikmFXEDByMo-OzBbl0C * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/a76c0dbb64..fc2c4ea571 Added dependencies * src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_annotations * src/third_party/android_deps/cipd/libs/io_grpc_grpc_binder * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm * src/third_party/android_deps/cipd/libs/com_android_tools_common * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_components * src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_tree * src/third_party/android_deps/cipd/libs/org_robolectric_nativeruntime_dist_compat * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_flags * src/third_party/android_deps/cipd/libs/javax_annotation_javax_annotation_api * src/third_party/android_deps/cipd/libs/com_google_testparameterinjector_test_parameter_injector * src/third_party/android_deps/cipd/libs/org_yaml_snakeyaml * src/third_party/android_deps/cipd/libs/com_android_tools_sdk_common * src/third_party/android_deps/cipd/libs/org_objenesis_objenesis * src/third_party/android_deps/cipd/libs/io_grpc_grpc_stub * src/third_party/android_deps/cipd/libs/org_robolectric_resources * src/third_party/android_deps/cipd/libs/com_squareup_moshi_moshi * src/third_party/android_deps/cipd/libs/org_robolectric_pluginapi * src/third_party/android_deps/cipd/libs/com_google_dagger_hilt_core * src/third_party/android_deps/cipd/libs/org_robolectric_shadows_framework * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_encoders_json * src/third_party/android_deps/cipd/libs/com_google_guava_guava * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_vision_common * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_base * src/third_party/android_deps/cipd/libs/com_squareup_javawriter * src/third_party/android_deps/cipd/libs/com_google_android_play_feature_delivery * src/third_party/android_deps/cipd/libs/com_google_j2objc_j2objc_annotations * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_messaging * src/third_party/android_deps/cipd/libs/io_perfmark_perfmark_api * src/third_party/android_deps/cipd/libs/org_robolectric_robolectric * src/third_party/android_deps/cipd/libs/org_jspecify_jspecify * src/third_party/android_deps/cipd/libs/io_grpc_grpc_core * src/third_party/android_deps/cipd/libs/org_robolectric_shadowapi * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime * src/third_party/android_deps/cipd/libs/com_google_code_gson_gson * src/third_party/android_deps/cipd/libs/javax_annotation_jsr250_api * src/third_party/android_deps/cipd/libs/com_google_protobuf_protobuf_javalite * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cast_framework * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_stats * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_base * src/third_party/android_deps/cipd/libs/com_android_support_support_annotations * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_iid * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cast * src/third_party/android_deps/cipd/libs/com_google_android_libraries_identity_googleid_googleid * src/third_party/android_deps/cipd/libs/org_robolectric_sandbox * src/third_party/android_deps/cipd/libs/org_bouncycastle_bcprov_jdk18on * src/third_party/android_deps/cipd/libs/javax_inject_javax_inject * src/third_party/android_deps/cipd/libs/org_ow2_asm_asm * src/third_party/android_deps/cipd/libs/com_squareup_wire_wire_runtime_jvm * src/third_party/android_deps/cipd/libs/com_squareup_javapoet * src/third_party/android_deps/cipd/libs/com_google_guava_failureaccess * src/third_party/android_deps/cipd/libs/com_google_auto_service_auto_service_annotations * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_api_phone * src/third_party/android_deps/cipd/libs/com_google_code_findbugs_jsr305 * src/third_party/android_deps/cipd/libs/org_jsoup_jsoup * src/third_party/android_deps/cipd/libs/org_checkerframework_checker_util * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_installations_interop * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_tasks * src/third_party/android_deps/cipd/libs/org_mockito_mockito_subclass * src/third_party/android_deps/cipd/libs/io_grpc_grpc_context * src/third_party/android_deps/cipd/libs/com_android_tools_layoutlib_layoutlib_api * src/third_party/android_deps/cipd/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework * src/third_party/android_deps/cipd/libs/org_checkerframework_checker_qual * src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_analysis * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_phenotype * src/third_party/android_deps/cipd/libs/org_robolectric_annotations * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_clearcut * src/third_party/android_deps/cipd/libs/org_robolectric_utils * src/third_party/android_deps/cipd/libs/com_google_android_datatransport_transport_api * src/third_party/android_deps/cipd/libs/io_grpc_grpc_protobuf_lite * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_installations * src/third_party/android_deps/cipd/libs/org_checkerframework_checker_compat_qual * src/third_party/android_deps/cipd/libs/jakarta_inject_jakarta_inject_api * src/third_party/android_deps/cipd/libs/org_mockito_mockito_android * src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_util * src/third_party/android_deps/cipd/libs/org_robolectric_plugins_maven_dependency_resolver * src/third_party/android_deps/cipd/libs/org_robolectric_nativeruntime * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_measurement_connector * src/third_party/android_deps/cipd/libs/org_conscrypt_conscrypt_openjdk_uber * src/third_party/android_deps/cipd/libs/org_robolectric_junit * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_annotations * src/third_party/android_deps/cipd/libs/com_squareup_okio_okio_jvm * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android * src/third_party/android_deps/cipd/libs/com_googlecode_java_diff_utils_diffutils * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_instantapps * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_identity_credentials * src/third_party/android_deps/cipd/libs/org_codehaus_mojo_animal_sniffer_annotations * src/third_party/android_deps/cipd/libs/org_mockito_mockito_core * src/third_party/android_deps/cipd/libs/net_bytebuddy_byte_buddy * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_fido * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_vision * src/third_party/android_deps/cipd/libs/net_bytebuddy_byte_buddy_agent * src/third_party/android_deps/cipd/libs/com_google_auto_value_auto_value_annotations * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_blockstore * src/third_party/android_deps/cipd/libs/org_ccil_cowan_tagsoup_tagsoup * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_gcm * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_common * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_encoders * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_location * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_atomicfu_jvm * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_iid * src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_iid_interop * src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_test_jvm * src/third_party/android_deps/cipd/libs/com_google_android_material_material * src/third_party/android_deps/cipd/libs/com_google_android_play_core_common * src/third_party/android_deps/cipd/libs/com_google_android_annotations * src/third_party/android_deps/cipd/libs/io_grpc_grpc_api * src/third_party/android_deps/cipd/libs/org_hamcrest_hamcrest * src/third_party/android_deps/cipd/libs/com_google_dagger_dagger * src/third_party/android_deps/cipd/libs/com_squareup_moshi_moshi_adapters * src/third_party/android_deps/cipd/libs/org_robolectric_utils_reflector * src/third_party/android_deps/cipd/libs/com_google_guava_guava_android * src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_commons * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_basement * src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cloud_messaging Removed dependencies * src/third_party/android_deps/libs/android_arch_core_common * src/third_party/android_deps/libs/android_arch_core_runtime * src/third_party/android_deps/libs/android_arch_lifecycle_common * src/third_party/android_deps/libs/android_arch_lifecycle_common_java8 * src/third_party/android_deps/libs/android_arch_lifecycle_livedata * src/third_party/android_deps/libs/android_arch_lifecycle_livedata_core * src/third_party/android_deps/libs/android_arch_lifecycle_runtime * src/third_party/android_deps/libs/android_arch_lifecycle_viewmodel * src/third_party/android_deps/libs/com_android_support_animated_vector_drawable * src/third_party/android_deps/libs/com_android_support_appcompat_v7 * src/third_party/android_deps/libs/com_android_support_asynclayoutinflater * src/third_party/android_deps/libs/com_android_support_cardview_v7 * src/third_party/android_deps/libs/com_android_support_collections * src/third_party/android_deps/libs/com_android_support_coordinatorlayout * src/third_party/android_deps/libs/com_android_support_cursoradapter * src/third_party/android_deps/libs/com_android_support_customview * src/third_party/android_deps/libs/com_android_support_design * src/third_party/android_deps/libs/com_android_support_documentfile * src/third_party/android_deps/libs/com_android_support_drawerlayout * src/third_party/android_deps/libs/com_android_support_interpolator * src/third_party/android_deps/libs/com_android_support_loader * src/third_party/android_deps/libs/com_android_support_localbroadcastmanager * src/third_party/android_deps/libs/com_android_support_multidex * src/third_party/android_deps/libs/com_android_support_print * src/third_party/android_deps/libs/com_android_support_recyclerview_v7 * src/third_party/android_deps/libs/com_android_support_slidingpanelayout * src/third_party/android_deps/libs/com_android_support_support_annotations * src/third_party/android_deps/libs/com_android_support_support_compat * src/third_party/android_deps/libs/com_android_support_support_core_ui * src/third_party/android_deps/libs/com_android_support_support_core_utils * src/third_party/android_deps/libs/com_android_support_support_fragment * src/third_party/android_deps/libs/com_android_support_support_media_compat * src/third_party/android_deps/libs/com_android_support_support_v4 * src/third_party/android_deps/libs/com_android_support_support_vector_drawable * src/third_party/android_deps/libs/com_android_support_swiperefreshlayout * src/third_party/android_deps/libs/com_android_support_transition * src/third_party/android_deps/libs/com_android_support_versionedparcelable * src/third_party/android_deps/libs/com_android_support_viewpager * src/third_party/android_deps/libs/com_android_tools_common * 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_github_ben_manes_caffeine_caffeine * src/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms * src/third_party/android_deps/libs/com_google_android_annotations * src/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework * src/third_party/android_deps/libs/com_google_android_datatransport_transport_api * src/third_party/android_deps/libs/com_google_android_gms_play_services_auth * src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone * src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base * src/third_party/android_deps/libs/com_google_android_gms_play_services_base * src/third_party/android_deps/libs/com_google_android_gms_play_services_basement * src/third_party/android_deps/libs/com_google_android_gms_play_services_cast * src/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework * src/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut * src/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging * src/third_party/android_deps/libs/com_google_android_gms_play_services_flags * src/third_party/android_deps/libs/com_google_android_gms_play_services_gcm * src/third_party/android_deps/libs/com_google_android_gms_play_services_iid * src/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps * src/third_party/android_deps/libs/com_google_android_gms_play_services_location * src/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype * src/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport * src/third_party/android_deps/libs/com_google_android_gms_play_services_stats * src/third_party/android_deps/libs/com_google_android_gms_play_services_tasks * src/third_party/android_deps/libs/com_google_android_gms_play_services_vision * src/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common * src/third_party/android_deps/libs/com_google_android_material_material * src/third_party/android_deps/libs/com_google_android_play_core_common * src/third_party/android_deps/libs/com_google_android_play_feature_delivery * src/third_party/android_deps/libs/com_google_auto_auto_common * src/third_party/android_deps/libs/com_google_auto_service_auto_service * src/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations * src/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations * src/third_party/android_deps/libs/com_google_code_findbugs_jsr305 * src/third_party/android_deps/libs/com_google_code_gson_gson * src/third_party/android_deps/libs/com_google_dagger_dagger * src/third_party/android_deps/libs/com_google_dagger_dagger_compiler * src/third_party/android_deps/libs/com_google_dagger_dagger_producers * src/third_party/android_deps/libs/com_google_dagger_dagger_spi * src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation * src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations * src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api * src/third_party/android_deps/libs/com_google_errorprone_error_prone_core * src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations * src/third_party/android_deps/libs/com_google_errorprone_javac * src/third_party/android_deps/libs/com_google_errorprone_javac_shaded * src/third_party/android_deps/libs/com_google_firebase_firebase_annotations * src/third_party/android_deps/libs/com_google_firebase_firebase_common * src/third_party/android_deps/libs/com_google_firebase_firebase_components * src/third_party/android_deps/libs/com_google_firebase_firebase_encoders * src/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json * src/third_party/android_deps/libs/com_google_firebase_firebase_iid * src/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop * src/third_party/android_deps/libs/com_google_firebase_firebase_installations * src/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop * src/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector * src/third_party/android_deps/libs/com_google_firebase_firebase_messaging * src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format * src/third_party/android_deps/libs/com_google_guava_failureaccess * src/third_party/android_deps/libs/com_google_guava_guava * src/third_party/android_deps/libs/com_google_guava_guava_android * src/third_party/android_deps/libs/com_google_guava_listenablefuture * src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations * src/third_party/android_deps/libs/com_google_protobuf_protobuf_java * src/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite * src/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils * src/third_party/android_deps/libs/com_squareup_javapoet * src/third_party/android_deps/libs/com_squareup_javawriter * src/third_party/android_deps/libs/com_squareup_okio_okio_jvm * src/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm * src/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils * src/third_party/android_deps/libs/io_grpc_grpc_api * src/third_party/android_deps/libs/io_grpc_grpc_binder * src/third_party/android_deps/libs/io_grpc_grpc_context * src/third_party/android_deps/libs/io_grpc_grpc_core * src/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite * src/third_party/android_deps/libs/io_grpc_grpc_stub * src/third_party/android_deps/libs/io_perfmark_perfmark_api * src/third_party/android_deps/libs/javax_annotation_javax_annotation_api * src/third_party/android_deps/libs/javax_annotation_jsr250_api * src/third_party/android_deps/libs/javax_inject_javax_inject * src/third_party/android_deps/libs/net_bytebuddy_byte_buddy * src/third_party/android_deps/libs/net_bytebuddy_byte_buddy_agent * src/third_party/android_deps/libs/net_ltgt_gradle_incap_incap * src/third_party/android_deps/libs/org_bouncycastle_bcprov_jdk18on * src/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup * src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual * src/third_party/android_deps/libs/org_checkerframework_checker_qual * src/third_party/android_deps/libs/org_checkerframework_checker_util * src/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone * src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations * src/third_party/android_deps/libs/org_conscrypt_conscrypt_openjdk_uber * src/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit * src/third_party/android_deps/libs/org_hamcrest_hamcrest * src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7 * src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8 * src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android * src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm * src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava * src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm * src/third_party/android_deps/libs/org_jsoup_jsoup * src/third_party/android_deps/libs/org_mockito_mockito_android * src/third_party/android_deps/libs/org_mockito_mockito_core * src/third_party/android_deps/libs/org_mockito_mockito_subclass * src/third_party/android_deps/libs/org_objenesis_objenesis * src/third_party/android_deps/libs/org_ow2_asm_asm * src/third_party/android_deps/libs/org_ow2_asm_asm_analysis * src/third_party/android_deps/libs/org_ow2_asm_asm_commons * src/third_party/android_deps/libs/org_ow2_asm_asm_tree * src/third_party/android_deps/libs/org_ow2_asm_asm_util * src/third_party/android_deps/libs/org_pcollections_pcollections * src/third_party/android_deps/libs/org_robolectric_annotations * src/third_party/android_deps/libs/org_robolectric_junit * src/third_party/android_deps/libs/org_robolectric_nativeruntime * src/third_party/android_deps/libs/org_robolectric_nativeruntime_dist_compat * src/third_party/android_deps/libs/org_robolectric_pluginapi * src/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver * src/third_party/android_deps/libs/org_robolectric_resources * src/third_party/android_deps/libs/org_robolectric_robolectric * src/third_party/android_deps/libs/org_robolectric_sandbox * src/third_party/android_deps/libs/org_robolectric_shadowapi * src/third_party/android_deps/libs/org_robolectric_shadows_framework * src/third_party/android_deps/libs/org_robolectric_shadows_playservices * src/third_party/android_deps/libs/org_robolectric_utils * src/third_party/android_deps/libs/org_robolectric_utils_reflector DEPS diff: https://chromium.googlesource.com/chromium/src/+/af3d01376b..f2539aa88a/DEPS Clang version changed llvmorg-17-init-16420-g0c545a44:llvmorg-20-init-13894-g8cb44859 Details: https://chromium.googlesource.com/chromium/src/+/af3d01376b..f2539aa88a/tools/clang/scripts/update.py BYPASS_LARGE_CHANGE_WARNING: Updating the DEPS is inherently a large change. See each patchset for smaller changes, but these partial updates don't build. Bug: libyuv:358992053 No-Try: true Change-Id: I37c7f51c247b5836f22ce635e6118d80ab7b1fdc Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/6111088 Reviewed-by: Frank Barchard Commit-Queue: Jeremy Leconte Reviewed-by: Mirko Bonadei --- BUILD.gn | 4 +- DEPS | 1692 ++++++++------------------ build_overrides/build.gni | 5 +- tools_libyuv/autoroller/roll_deps.py | 2 - 4 files changed, 518 insertions(+), 1185 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f37f43a38..649249dfd 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -395,6 +395,7 @@ if (libyuv_include_tests) { if (is_linux || is_chromeos) { cflags = [ "-fexceptions" ] + # For enabling ASLR. ldflags = [ "-pie" ] } @@ -406,9 +407,6 @@ if (libyuv_include_tests) { if (!is_ios && !libyuv_disable_jpeg) { defines += [ "HAVE_JPEG" ] } - if (is_android) { - deps += [ "//testing/android/native_test:native_test_native_code" ] - } # TODO(YangZhang): These lines can be removed when high accuracy # YUV to RGB to Neon is ported. diff --git a/DEPS b/DEPS index 68e82de5d..75044a332 100644 --- a/DEPS +++ b/DEPS @@ -5,13 +5,13 @@ gclient_gn_args = [ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'af3d01376bec75a68f90160bfd38057d60510a2b', - 'gn_version': 'git_revision:fae280eabe5d31accc53100137459ece19a7a295', + 'chromium_revision': 'f2539aa88aceb9894288df586fcc9adf65b0d17a', + 'gn_version': 'git_revision:c97a86a72105f3328a540f5a5ab17d11989ab7dd', # ninja CIPD package version. # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja - 'ninja_version': 'version:2@1.11.1.chromium.6', + 'ninja_version': 'version:3@1.12.1.chromium.4', # reclient CIPD package version - 'reclient_version': 're_client_version:0.110.0.43ec6b1-gomaip', + 'reclient_version': 're_client_version:0.172.0.3cf60ba5-gomaip', # Fetch configuration files required for the 'use_remoteexec' gn arg 'download_remoteexec_cfg': False, # RBE instance to use for running remote builds @@ -25,26 +25,29 @@ vars = { # By default, download the fuchsia sdk from the public sdk directory. 'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/core/', - 'fuchsia_version': 'version:15.20230909.2.1', + 'fuchsia_version': 'version:26.20241213.3.1', # By default, download the fuchsia images from the fuchsia GCS bucket. 'fuchsia_images_bucket': 'fuchsia', 'checkout_fuchsia': False, # Since the images are hundreds of MB, default to only downloading the image # most commonly useful for developers. Bots and developers that need to use # other images can override this with additional images. - 'checkout_fuchsia_boot_images': "terminal.qemu-x64,terminal.x64", + 'checkout_fuchsia_boot_images': "terminal.x64", 'checkout_fuchsia_product_bundles': '"{checkout_fuchsia_boot_images}" != ""', + + # condition to allowlist deps for non-git-source processing. + 'non_git_source': 'True', } deps = { 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '5885d3c24833ad72845a52a1b913a2b8bc651b56', + Var('chromium_git') + '/chromium/src/build' + '@' + '1923aa3e3298124d2210011dfa4af63d48c5729e', 'src/buildtools': - Var('chromium_git') + '/chromium/src/buildtools' + '@' + '79ab87fa54614258c4c95891e873223371194525', + Var('chromium_git') + '/chromium/src/buildtools' + '@' + 'b8ff6f5a95e9144c6f55c2ec4ca97849d97ed0aa', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '51e9a02297057cc0e917763a51e16680b7d16fb6', + Var('chromium_git') + '/chromium/src/testing' + '@' + '0305a85a20b28da1ad923de7987b218fd3ed2ecb', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '2dc4b18abd1003ce7b1eda509dc96f12d49a9667', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'd9ea6d4e7debb0d0af2600c2c34c4b14d0a03f65', 'src/buildtools/linux64': { 'packages': [ @@ -90,9 +93,9 @@ deps = { }, 'src/third_party/catapult': - Var('chromium_git') + '/catapult.git' + '@' + 'fa05d995e152efdae488a2aeba397cd609fdbc9d', + Var('chromium_git') + '/catapult.git' + '@' + 'e7c18388ace53c641823655858654c5ac9c8e64b', 'src/third_party/clang-format/script': - Var('chromium_git') + '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git' + '@' + 'f97059df7f8b205064625cdb5f97b56668a125ef', + Var('chromium_git') + '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git' + '@' + '37f6e68a107df43b7d7e044fd36a13cbae3413f2', 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '3de9f013df4b470069d03d250224062e8cf15c49', 'src/third_party/cpu_features/src': { @@ -100,29 +103,36 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'd3e43dd4319ba169c0aaf44547eecf861f2fe5da', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'fcb617891482ccf704e6d9442e4b7eed886fdb57', 'src/third_party/freetype/src': - Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '9e3c5d7e183c1a8d5ed8868d7d28ef18d3ec9ec8', + Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '38272bf85341348eb0a5162ba4e1c95d370f9bce', 'third_party/fuchsia-gn-sdk': { 'url': Var('chromium_git') + '/chromium/src/third_party/fuchsia-gn-sdk.git' + '@' + '0d6902558d92fe3d49ba9a8f638ddea829be595b', 'condition': 'checkout_fuchsia', }, 'src/third_party/googletest/src': - Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'af29db7ec28d6df1c7f0f745186884091e602e07', + Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'f3c355f9dd382bc2c323be2713e351a578b68c61', 'src/third_party/harfbuzz-ng/src': - Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + 'db700b5670d9475cc8ed4880cc9447b232c5e432', + Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + '1c249be96e27eafd15eb86d832b67fbc3751634b', + 'src/third_party/instrumented_libs': { + 'url': Var('chromium_git') + '/chromium/third_party/instrumented_libraries.git' + '@' + '3cc43119a29158bcde39d288a8def4b8ec49baf8', + 'condition': 'checkout_instrumented_libraries', + }, 'src/third_party/libc++/src': - Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + '84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80', + Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + 'd0ddad5b79581e19d8e1aec627bb2ad86e1554cd', 'src/third_party/libc++abi/src': - Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' + '8d21803b9076b16d46c32e2f10da191ee758520c', + Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' + '02cb51229253c5fc0a061bdd0ebd572d7e127452', + 'src/third_party/llvm-libc/src': + Var('chromium_git') + '/external/github.com/llvm/llvm-project/libc.git' + '@' + '4f9b6ad674f8bfdb3257db3a329edbd7de41ebb1', + 'src/third_party/libunwind/src': - Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + 'f1c687e0aaf0d70b9a53a150e9be5cb63af9215f', + Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + 'd1e95b102f113ded38974cf06a65fe0457b6004b', 'src/third_party/libjpeg_turbo': - Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '30bdb85e302ecfc52593636b2f44af438e05e784', + Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '927aabfcd26897abb9776ecf2a6c38ea5bb52ab6', 'src/third_party/nasm': - Var('chromium_git') + '/chromium/deps/nasm.git' + '@' + '7fc833e889d1afda72c06220e5bed8fb43b2e5ce', + Var('chromium_git') + '/chromium/deps/nasm.git' + '@' + 'f477acb1049f5e043904b87b825c5915084a9a29', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + 'a76c0dbb64c603a0d45e0c6dfae3a351b6e1adf1', + Var('chromium_git') + '/chromium/src/tools' + '@' + 'fc2c4ea571f0aa0529b6d9a10f4b530e5974b5f5', # libyuv-only dependencies (not present in Chromium). 'src/third_party/gtest-parallel': @@ -133,33 +143,26 @@ deps = { 'condition': 'checkout_android or checkout_linux', }, + 'src/third_party/re2/src': + Var('chromium_git') + '/external/github.com/google/re2.git' + '@' + '6dcd83d60f7944926bfd308cc13979fc53dd69ca', + # Android deps: - 'src/third_party/accessibility_test_framework': { + 'src/third_party/kotlin_stdlib/cipd': { 'packages': [ { - 'package': 'chromium/third_party/accessibility-test-framework', - 'version': 'b5ec1e56e58e56bc1a0c77d43111c37f9b512c8a', + 'package': 'chromium/third_party/kotlin_stdlib', + 'version': 'GjL64HceCa9uCZWJ1u-a174ay-7m1EZTupVwLzzxbrEC', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/kotlin_stdlib': { - 'packages': [ - { - 'package': 'chromium/third_party/kotlin_stdlib', - 'version': 'Z1gsqhL967kFQecxKrRwXHbl-vwQjpv0l7PMUZ0EVO8C', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, 'src/third_party/kotlinc/current': { 'packages': [ { 'package': 'chromium/third_party/kotlinc', - 'version': 'Rr02Gf2EkaeSs3EhSUHhPqDHSd1AzimrM6cRYUJCPjQC', + 'version': 'HckNA1Q54JBiHrpY1gP5qblVCdeuVmGsiGCdv1XjqywC', }, ], 'condition': 'checkout_android', @@ -167,53 +170,34 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git' + '@' + '20a06474c0b4a16779311bfe98ba69dc2402101d', + 'https://boringssl.googlesource.com/boringssl.git' + '@' + 'c361e279402ec359834b7eaa7d737462d02675e1', 'src/base': { - 'url': Var('chromium_git') + '/chromium/src/base' + '@' + 'd407b7061bce341bb6e11b539ea86c46c949ac4c', + 'url': Var('chromium_git') + '/chromium/src/base' + '@' + 'aefc8255092bc58c24dd820d354e3248f0dd1e3b', 'condition': 'checkout_android', }, - 'src/third_party/bazel': { - 'packages': [ - { - 'package': 'chromium/third_party/bazel', - 'version': 'VjMsf48QUWw8n7XtJP2AuSjIGmbQeYdWdwyxVvIRLmAC', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/bouncycastle': { - 'packages': [ - { - 'package': 'chromium/third_party/bouncycastle', - 'version': 'c078e87552ba26e776566fdaf0f22cd8712743d0', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/android_toolchain': { - 'packages': [ - { - 'package': 'chromium/third_party/android_toolchain/android_toolchain', - 'version': 'R_8suM8m0oHbZ1awdxGXvKEFpAOETscbfZxkkMthyk8C', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/androidx': { + 'src/third_party/android_toolchain/ndk': { 'packages': [ { - 'package': 'chromium/third_party/androidx', - 'version': 'y7rF_rx56mD3FGhMiqnlbQ6HOqHJ95xUFNX1m-_a988C', + 'package': 'chromium/third_party/android_toolchain/android_toolchain', + 'version': 'Idl-vYnWGnM8K3XJhM3h6zjYVDXlnljVz3FE00V9IM8C', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/androidx/cipd': { + 'packages': [ + { + 'package': 'chromium/third_party/androidx', + 'version': 'UgU67e5iHzB2He0pnVLopdT8E6Z-vYa65s2LUhagBfoC', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + 'src/third_party/android_support_test_runner': { 'packages': [ { @@ -226,38 +210,26 @@ deps = { }, 'src/third_party/android_sdk/public': { 'packages': [ - { - 'package': 'chromium/third_party/android_sdk/public/build-tools/34.0.0', - 'version': 'YK9Rzw3fDzMHVzatNN6VlyoD_81amLZpN1AbmkdOd6AC', - }, - { + { + 'package': 'chromium/third_party/android_sdk/public/build-tools/35.0.0', + 'version': 'DxwAZ3hD551Neu6ycuW5CPnXFrdleRBd93oX1eB_m9YC' + }, + { 'package': 'chromium/third_party/android_sdk/public/emulator', - 'version': '9lGp8nTUCRRWGMnI_96HcKfzjnxEJKUcfvfwmA3wXNkC', - }, - { - 'package': 'chromium/third_party/android_sdk/public/patcher', - 'version': 'I6FNMhrXlpB-E1lOhMlvld7xt9lBVNOO83KIluXDyA0C', - }, - { + 'version': '9lGp8nTUCRRWGMnI_96HcKfzjnxEJKUcfvfwmA3wXNkC' + }, + { 'package': 'chromium/third_party/android_sdk/public/platform-tools', - 'version': 'HWVsGs2HCKgSVv41FsOcsfJbNcB0UFiNrF6Tc4yRArYC', - }, - { - 'package': 'chromium/third_party/android_sdk/public/platforms/android-34', - 'version': 'u-bhWbTME6u-DjypTgr3ZikCyeAeU6txkR9ET6Uudc8C', - }, - { - 'package': 'chromium/third_party/android_sdk/public/platforms/android-tiramisuprivacysandbox', - 'version': 'YWMYkzyxGBgVsty0GhXL1oxbY0pGXQIgFc0Rh7ZMRPYC', - }, - { - 'package': 'chromium/third_party/android_sdk/public/sources/android-31', - 'version': '_a_BcnANjPYw5mSKlNHa7GFY8yc1kdqj2rmQgac7yUcC', - }, - { + 'version': 'WihaseZR6cojZbkzIqwGhpTp92ztaGfqq8njBU8eTXYC' + }, + { + 'package': 'chromium/third_party/android_sdk/public/platforms/android-35', + 'version': 'kIXA-9XuCfOESodXEdOBkW5f1ytrGWdbp3HFp1I8A_0C' + }, + { 'package': 'chromium/third_party/android_sdk/public/cmdline-tools', - 'version': 'EWnL2r7oV5GtE9Ef7GyohyFam42wtMtEKYU4dCb3U1YC', - }, + 'version': 'OCGHZKTdjXjIELVI6FMAgcDkfnd_1ybB0_MtljPtz-8C' + } ], 'condition': 'checkout_android', 'dep_type': 'cipd', @@ -272,36 +244,19 @@ deps = { 'condition': 'checkout_mac', 'dep_type': 'cipd', }, - 'src/third_party/android_build_tools/aapt2': { + + + 'src/third_party/android_build_tools/aapt2/cipd': { 'packages': [ { 'package': 'chromium/third_party/android_build_tools/aapt2', - 'version': 'STY0BXlZxsEhudnlXQFed-B5UpwehcoM0sYqor6qRqsC', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/byte_buddy': { - 'packages': [ - { - 'package': 'chromium/third_party/byte_buddy', - 'version': 'c9b53316603fc2d997c899c7ca1707f809b918cd', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - 'src/third_party/byte_buddy/android_sdk_build_tools_25_0_2': { - 'packages': [ - { - 'package': 'chromium/third_party/android_sdk/public/build-tools', - 'version': 'kwIs2vdfTm93yEP8LG5aSnchN4BVEdVxbqQtF4XpPdkC', + 'version': 'JPmxYHMZl4VH2Umf2-flGSdTVHtNDdFBmXd7v1Gs7EoC', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/ced/src': { 'url': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + 'ba412eaaacd3186085babcd901679a48863c7dd5', 'condition': 'checkout_android', @@ -334,30 +289,34 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/hamcrest': { + + 'src/third_party/hamcrest/cipd': { 'packages': [ { 'package': 'chromium/third_party/hamcrest', - 'version': '37eccfc658fe79695d6abb6dd497463c4372032f', + 'version': 'dBioOAmFJjqAr_DY7dipbXdVfAxUQwjOBNibMPtX8lQC', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/icu': { - 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'e8c3bc9ea97d4423ad0515e5f1c064f486dae8b1', + 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'bbccc2f6efc1b825de5f2c903c48be685cd0cf22', }, - 'src/third_party/icu4j': { + + 'src/third_party/icu4j/cipd': { 'packages': [ { 'package': 'chromium/third_party/icu4j', - 'version': 'e87e5bed2b4935913ee26a3ebd0b723ee2344354', + 'version': '8dV7WRVX0tTaNNqkLEnCA_dMofr2MJXFK400E7gOFygC', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/intellij': { 'packages': [ { @@ -368,14 +327,14 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/jdk': { + 'src/third_party/jdk/current': { 'packages': [ { 'package': 'chromium/third_party/jdk', - 'version': 'GCFtf5t6M4HlrHj6NXedHbpHp2xjgognF8ptNci4478C', + 'version': 'G-WIGWdFIBTPPhv2xPK_lTfI5N7WmfCBh0oTKqX-c5sC', }, - ], - 'condition': 'checkout_android', + ], + 'condition': 'host_os == "linux" and checkout_android', 'dep_type': 'cipd', }, 'src/third_party/jsr-305/src': { @@ -383,11 +342,11 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/junit/src': { - 'url': Var('chromium_git') + '/external/junit.git' + '@' + '05fe2a64f59127c02135be22f416e91260d6ede6', + 'url': Var('chromium_git') + '/external/junit.git' + '@' + '0eb5ce72848d730da5bd6d42902fdd6a8a42055d', 'condition': 'checkout_android', }, 'src/third_party/libunwindstack': { - 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + '4dbfa0e8c844c8e243b297bc185e54a99ff94f9e', + 'url': Var('chromium_git') + '/chromium/src/third_party/libunwindstack.git' + '@' + '215bddfd8eecb7dd990494854a31b70a96d71b3c', 'condition': 'checkout_android', }, 'src/third_party/ninja': { @@ -403,16 +362,6 @@ deps = { 'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + '7c3641bcef717ffa7d765f2c86b847d0aab1aac9', 'condition': 'checkout_android', }, - 'src/third_party/objenesis': { - 'packages': [ - { - 'package': 'chromium/third_party/objenesis', - 'version': 'tknDblENYi8IaJYyD6tUahUyHYZlzJ_Y74_QZSz4DpIC', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, 'src/third_party/ow2_asm': { 'packages': [ { @@ -423,11 +372,12 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/r8': { + + 'src/third_party/r8/cipd': { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'O1BBWiBTIeNUcraX8STMtQXVaCleu6SJJjWCcnfhPLkC', + 'version': 'q_wvk54XItTBlBNQMHkS4NRMp-tapPW97M292KTXHrsC', }, ], 'condition': 'checkout_android', @@ -436,11 +386,11 @@ deps = { # This duplication is intentional, so we avoid updating the r8.jar used by # dexing unless necessary, since each update invalidates all incremental # dexing and unnecessarily slows down all bots. - 'src/third_party/r8/d8': { + 'src/third_party/r8/d8/cipd': { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'vw5kLlW3-suSlCKSO9OQpFWpR8oDnvQ8k1RgKNUapQYC', + 'version': 'q_wvk54XItTBlBNQMHkS4NRMp-tapPW97M292KTXHrsC', }, ], 'condition': 'checkout_android', @@ -460,17 +410,19 @@ deps = { 'url': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'c7e0fc087ceeadb8b4c84a0953a422c474093d6d', 'condition': 'checkout_android', }, - 'src/third_party/robolectric': { + + 'src/third_party/robolectric/cipd': { 'packages': [ { 'package': 'chromium/third_party/robolectric', - 'version': 'hzetqh1qFI32FOgQroZvGcGdomrgVBJ6WKRnl1KFw6EC', + 'version': 'G3VkWqTv1YWDvC6zCrL34iQREzrzdBmSL4GMboAIiAEC', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/sqlite4java': { + + 'src/third_party/sqlite4java/cipd': { 'packages': [ { 'package': 'chromium/third_party/sqlite4java', @@ -480,11 +432,11 @@ deps = { 'condition': 'checkout_android', 'dep_type': 'cipd', }, - 'src/third_party/turbine': { + 'src/third_party/turbine/cipd': { 'packages': [ { 'package': 'chromium/third_party/turbine', - 'version': '2I2Nz480QsuCxpQ1lMfbigX8l5HAhX3_ykWU4TKRGo4C', + 'version': 'dz8pRLjwNlToJ0tS14T-TDQJNikmFXEDByMo-OzBbl0C', }, ], 'condition': 'checkout_android', @@ -497,1825 +449,1308 @@ deps = { # iOS deps: 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'ddd58e86cf4ebdc0db60a5d0f3c323de49bb295c', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '15caecbcad907d7cf048d29b591d96f2cff1458c', 'condition': 'checkout_ios' }, # Everything coming after this is automatically updated by the auto-roller. # === ANDROID_DEPS Generated Code Start === # Generated by //third_party/android_deps/fetch_all.py - 'src/third_party/android_deps/libs/android_arch_core_common': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/android_arch_core_common', - 'version': 'version:2@1.1.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/android_arch_core_runtime': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/android_arch_core_runtime', - 'version': 'version:2@1.1.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/android_arch_lifecycle_common': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common', - 'version': 'version:2@1.1.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/android_arch_lifecycle_common_java8': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common_java8', - 'version': 'version:2@1.1.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/android_arch_lifecycle_livedata': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata', - 'version': 'version:2@1.1.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/android_arch_lifecycle_livedata_core': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_livedata_core', - 'version': 'version:2@1.1.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/android_arch_lifecycle_runtime': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime', - 'version': 'version:2@1.1.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/android_arch_lifecycle_viewmodel': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_viewmodel', - 'version': 'version:2@1.1.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_animated_vector_drawable': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_animated_vector_drawable', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_appcompat_v7': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_appcompat_v7', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_asynclayoutinflater': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_asynclayoutinflater', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_cardview_v7': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_cardview_v7', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_collections': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_collections', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_coordinatorlayout': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_coordinatorlayout', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_cursoradapter': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_cursoradapter', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_customview': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_customview', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_design': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_design', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_documentfile': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_documentfile', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_drawerlayout': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_drawerlayout', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_interpolator': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_interpolator', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_loader': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_loader', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_localbroadcastmanager': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_localbroadcastmanager', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_multidex': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_multidex', - 'version': 'version:2@1.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_print': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_print', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_recyclerview_v7': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_recyclerview_v7', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_slidingpanelayout': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_slidingpanelayout', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_support_annotations': { + 'src/third_party/android_deps/cipd/libs/com_android_support_support_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_annotations', 'version': 'version:2@28.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_support_support_compat': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_compat', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_support_core_ui': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_ui', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_support_core_utils': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_utils', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_support_fragment': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_fragment', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_support_media_compat': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_media_compat', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_support_v4': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_v4', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_support_vector_drawable': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_vector_drawable', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_swiperefreshlayout': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_swiperefreshlayout', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_transition': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_transition', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_versionedparcelable': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_versionedparcelable', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_support_viewpager': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_android_support_viewpager', - 'version': 'version:2@28.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_android_tools_common': { + 'src/third_party/android_deps/cipd/libs/com_android_tools_common': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_tools_common', 'version': 'version:2@30.2.0-beta01.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api': { + 'src/third_party/android_deps/cipd/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.2.0-beta01.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_android_tools_sdk_common': { + 'src/third_party/android_deps/cipd/libs/com_android_tools_sdk_common': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_tools_sdk_common', 'version': 'version:2@30.2.0-beta01.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine', - 'version': 'version:2@2.8.8.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms', - 'version': 'version:2@1.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_android_annotations': { + 'src/third_party/android_deps/cipd/libs/com_google_android_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_annotations', 'version': 'version:2@4.1.1.4.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework': { + 'src/third_party/android_deps/cipd/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework', 'version': 'version:2@4.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_datatransport_transport_api': { + 'src/third_party/android_deps/cipd/libs/com_google_android_datatransport_transport_api': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_datatransport_transport_api', 'version': 'version:2@2.2.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth', - 'version': 'version:2@20.1.0.cr1', + 'version': 'version:2@21.1.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_api_phone': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone', - 'version': 'version:2@18.0.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', 'version': 'version:2@18.0.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_base': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_base': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base', + 'version': 'version:2@18.0.10.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_auth_blockstore': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_blockstore', + 'version': 'version:2@16.4.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_base': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base', - 'version': 'version:2@18.0.1.cr1', + 'version': 'version:2@18.5.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_basement': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_basement': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement', - 'version': 'version:2@18.1.0.cr1', + 'version': 'version:2@18.4.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cast': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast', 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cast_framework': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework', 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_clearcut': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut', 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_cloud_messaging': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging', 'version': 'version:2@16.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_flags': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_fido': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido', + 'version': 'version:2@21.1.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_flags': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags', 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_gcm': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_gcm': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm', 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_iid': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_identity_credentials': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_identity_credentials', + 'version': 'version:2@16.0.0-alpha02.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_iid': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid', 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_instantapps': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps', 'version': 'version:2@18.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_location': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_location': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location', - 'version': 'version:2@19.0.1.cr1', + 'version': 'version:2@21.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_phenotype': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype', 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport', - 'version': 'version:2@17.0.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_stats': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_stats': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats', 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_tasks': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_tasks': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks', - 'version': 'version:2@18.0.2.cr1', + 'version': 'version:2@18.2.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_vision': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision', 'version': 'version:2@20.1.3.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common': { + 'src/third_party/android_deps/cipd/libs/com_google_android_gms_play_services_vision_common': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common', 'version': 'version:2@19.1.3.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_material_material': { + 'src/third_party/android_deps/cipd/libs/com_google_android_libraries_identity_googleid_googleid': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_libraries_identity_googleid_googleid', + 'version': 'version:2@1.1.1.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_google_android_material_material': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', - 'version': 'version:2@1.7.0-alpha02.cr1', + 'version': 'version:2@1.13.0-alpha05.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_play_core_common': { + 'src/third_party/android_deps/cipd/libs/com_google_android_play_core_common': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core_common', 'version': 'version:2@2.0.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_android_play_feature_delivery': { + 'src/third_party/android_deps/cipd/libs/com_google_android_play_feature_delivery': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_feature_delivery', 'version': 'version:2@2.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_auto_auto_common': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_auto_auto_common', - 'version': 'version:2@1.2.1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_auto_service_auto_service': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service', - 'version': 'version:2@1.0-rc6.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations': { + 'src/third_party/android_deps/cipd/libs/com_google_auto_service_auto_service_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations', 'version': 'version:2@1.0-rc6.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations': { + 'src/third_party/android_deps/cipd/libs/com_google_auto_value_auto_value_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_auto_value_auto_value_annotations', - 'version': 'version:2@1.10.1.cr1', + 'version': 'version:2@1.11.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_code_findbugs_jsr305': { + 'src/third_party/android_deps/cipd/libs/com_google_code_findbugs_jsr305': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', 'version': 'version:2@3.0.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_code_gson_gson': { + 'src/third_party/android_deps/cipd/libs/com_google_code_gson_gson': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson', 'version': 'version:2@2.9.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_dagger_dagger': { + 'src/third_party/android_deps/cipd/libs/com_google_dagger_dagger': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger', - 'version': 'version:2@2.30.cr1', + 'version': 'version:2@2.52.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_dagger_dagger_compiler': { + 'src/third_party/android_deps/cipd/libs/com_google_dagger_hilt_core': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler', - 'version': 'version:2@2.30.cr1', + 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_hilt_core', + 'version': 'version:2@2.52.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_dagger_dagger_producers': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers', - 'version': 'version:2@2.30.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_dagger_dagger_spi': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi', - 'version': 'version:2@2.30.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation', - 'version': 'version:2@2.11.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations': { + 'src/third_party/android_deps/cipd/libs/com_google_errorprone_error_prone_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', - 'version': 'version:2@2.18.0.cr1', + 'version': 'version:2@2.30.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api', - 'version': 'version:2@2.11.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_core': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core', - 'version': 'version:2@2.11.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations', - 'version': 'version:2@2.11.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_errorprone_javac': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac', - 'version': 'version:2@9+181-r4173-1.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_errorprone_javac_shaded': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded', - 'version': 'version:2@9-dev-r4023-3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_firebase_firebase_annotations': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_annotations', 'version': 'version:2@16.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_common': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_common': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_common', 'version': 'version:2@19.5.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_components': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_components': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_components', 'version': 'version:2@16.1.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_encoders': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_encoders': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders', 'version': 'version:2@16.1.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_encoders_json': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_encoders_json', 'version': 'version:2@17.1.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_iid': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_iid': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid', 'version': 'version:2@21.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_iid_interop': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_iid_interop', 'version': 'version:2@17.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_installations': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_installations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations', 'version': 'version:2@16.3.5.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_installations_interop': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_installations_interop', 'version': 'version:2@16.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_measurement_connector': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector', 'version': 'version:2@18.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_firebase_firebase_messaging': { + 'src/third_party/android_deps/cipd/libs/com_google_firebase_firebase_messaging': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_firebase_firebase_messaging', 'version': 'version:2@21.0.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format', - 'version': 'version:2@1.5.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_guava_failureaccess': { + 'src/third_party/android_deps/cipd/libs/com_google_guava_failureaccess': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess', - 'version': 'version:2@1.0.1.cr1', + 'version': 'version:2@1.0.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_guava_guava': { + 'src/third_party/android_deps/cipd/libs/com_google_guava_guava': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', - 'version': 'version:2@31.1-jre.cr1', + 'version': 'version:2@33.3.1-jre.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_guava_guava_android': { + 'src/third_party/android_deps/cipd/libs/com_google_guava_guava_android': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android', - 'version': 'version:2@31.1-android.cr1', + 'version': 'version:2@33.3.1-android.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_guava_listenablefuture': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_guava_listenablefuture', - 'version': 'version:2@1.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations': { + 'src/third_party/android_deps/cipd/libs/com_google_j2objc_j2objc_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations', - 'version': 'version:2@1.3.cr1', + 'version': 'version:2@3.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_google_protobuf_protobuf_java': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_java', - 'version': 'version:2@3.19.2.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite': { + 'src/third_party/android_deps/cipd/libs/com_google_protobuf_protobuf_javalite': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', - 'version': 'version:2@3.21.1.cr1', + 'version': 'version:2@4.28.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils': { + 'src/third_party/android_deps/cipd/libs/com_google_testparameterinjector_test_parameter_injector': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_testparameterinjector_test_parameter_injector', + 'version': 'version:2@1.18.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_googlecode_java_diff_utils_diffutils': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils', 'version': 'version:2@1.3.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_squareup_javapoet': { + 'src/third_party/android_deps/cipd/libs/com_squareup_javapoet': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet', 'version': 'version:2@1.13.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_squareup_javawriter': { + 'src/third_party/android_deps/cipd/libs/com_squareup_javawriter': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter', 'version': 'version:2@2.1.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_squareup_okio_okio_jvm': { + 'src/third_party/android_deps/cipd/libs/com_squareup_moshi_moshi': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_squareup_moshi_moshi', + 'version': 'version:2@1.15.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_squareup_moshi_moshi_adapters': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_squareup_moshi_moshi_adapters', + 'version': 'version:2@1.15.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/com_squareup_okio_okio_jvm': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_okio_okio_jvm', - 'version': 'version:2@3.3.0.cr1', + 'version': 'version:2@3.9.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm': { + 'src/third_party/android_deps/cipd/libs/com_squareup_wire_wire_runtime_jvm': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_squareup_wire_wire_runtime_jvm', - 'version': 'version:2@4.7.0.cr1', + 'version': 'version:2@5.0.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils', - 'version': 'version:2@4.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/io_grpc_grpc_api': { + 'src/third_party/android_deps/cipd/libs/io_grpc_grpc_api': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_api', 'version': 'version:2@1.49.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/io_grpc_grpc_binder': { + 'src/third_party/android_deps/cipd/libs/io_grpc_grpc_binder': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_binder', 'version': 'version:2@1.49.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/io_grpc_grpc_context': { + 'src/third_party/android_deps/cipd/libs/io_grpc_grpc_context': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_context', 'version': 'version:2@1.49.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/io_grpc_grpc_core': { + 'src/third_party/android_deps/cipd/libs/io_grpc_grpc_core': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_core', 'version': 'version:2@1.49.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite': { + 'src/third_party/android_deps/cipd/libs/io_grpc_grpc_protobuf_lite': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite', 'version': 'version:2@1.49.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/io_grpc_grpc_stub': { + 'src/third_party/android_deps/cipd/libs/io_grpc_grpc_stub': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_stub', 'version': 'version:2@1.49.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/io_perfmark_perfmark_api': { + 'src/third_party/android_deps/cipd/libs/io_perfmark_perfmark_api': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/io_perfmark_perfmark_api', 'version': 'version:2@0.25.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/javax_annotation_javax_annotation_api': { + 'src/third_party/android_deps/cipd/libs/jakarta_inject_jakarta_inject_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/jakarta_inject_jakarta_inject_api', + 'version': 'version:2@2.0.1.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/javax_annotation_javax_annotation_api': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api', 'version': 'version:2@1.3.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/javax_annotation_jsr250_api': { + 'src/third_party/android_deps/cipd/libs/javax_annotation_jsr250_api': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api', 'version': 'version:2@1.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/javax_inject_javax_inject': { + 'src/third_party/android_deps/cipd/libs/javax_inject_javax_inject': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject', 'version': 'version:2@1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/net_bytebuddy_byte_buddy': { + 'src/third_party/android_deps/cipd/libs/net_bytebuddy_byte_buddy': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy', - 'version': 'version:2@1.14.5.cr1', + 'version': 'version:2@1.14.12.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/net_bytebuddy_byte_buddy_agent': { + 'src/third_party/android_deps/cipd/libs/net_bytebuddy_byte_buddy_agent': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/net_bytebuddy_byte_buddy_agent', - 'version': 'version:2@1.14.5.cr1', + 'version': 'version:2@1.14.12.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/net_ltgt_gradle_incap_incap': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/net_ltgt_gradle_incap_incap', - 'version': 'version:2@0.2.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_bouncycastle_bcprov_jdk18on': { + 'src/third_party/android_deps/cipd/libs/org_bouncycastle_bcprov_jdk18on': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_bouncycastle_bcprov_jdk18on', - 'version': 'version:2@1.72.cr1', + 'version': 'version:2@1.78.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup': { + 'src/third_party/android_deps/cipd/libs/org_ccil_cowan_tagsoup_tagsoup': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ccil_cowan_tagsoup_tagsoup', 'version': 'version:2@1.2.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual': { + 'src/third_party/android_deps/cipd/libs/org_checkerframework_checker_compat_qual': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual', 'version': 'version:2@2.5.5.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_checkerframework_checker_qual': { + 'src/third_party/android_deps/cipd/libs/org_checkerframework_checker_qual': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', - 'version': 'version:2@3.25.0.cr1', + 'version': 'version:2@3.43.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_checkerframework_checker_util': { + 'src/third_party/android_deps/cipd/libs/org_checkerframework_checker_util': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_util', 'version': 'version:2@3.25.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone', - 'version': 'version:2@3.15.0.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations': { + 'src/third_party/android_deps/cipd/libs/org_codehaus_mojo_animal_sniffer_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', 'version': 'version:2@1.21.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_conscrypt_conscrypt_openjdk_uber': { + 'src/third_party/android_deps/cipd/libs/org_conscrypt_conscrypt_openjdk_uber': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_conscrypt_conscrypt_openjdk_uber', 'version': 'version:2@2.5.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit', - 'version': 'version:2@4.4.1.201607150455-r.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_hamcrest_hamcrest': { + 'src/third_party/android_deps/cipd/libs/org_hamcrest_hamcrest': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_hamcrest_hamcrest', 'version': 'version:2@2.2.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7', - 'version': 'version:2@1.8.20.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime', + 'version': 'version:2@1.9.22.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8', - 'version': 'version:2@1.8.20.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime', + 'version': 'version:2@1.9.22.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_atomicfu_jvm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm', + 'version': 'version:2@0.23.2.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android', - 'version': 'version:2@1.6.4.cr1', + 'version': 'version:2@1.8.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm', - 'version': 'version:2@1.6.4.cr1', + 'version': 'version:2@1.8.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava', - 'version': 'version:2@1.6.4.cr1', + 'version': 'version:2@1.8.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_test_jvm': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm', - 'version': 'version:2@0.1.0.cr1', + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_test_jvm', + 'version': 'version:2@1.7.3.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_jsoup_jsoup': { + 'src/third_party/android_deps/cipd/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm', + 'version': 'version:2@1.7.2.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/org_jsoup_jsoup': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_jsoup_jsoup', 'version': 'version:2@1.15.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_mockito_mockito_android': { + 'src/third_party/android_deps/cipd/libs/org_jspecify_jspecify': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_jspecify_jspecify', + 'version': 'version:2@1.0.0.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/org_mockito_mockito_android': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_android', - 'version': 'version:2@5.4.0.cr1', + 'version': 'version:2@5.11.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_mockito_mockito_core': { + 'src/third_party/android_deps/cipd/libs/org_mockito_mockito_core': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_core', - 'version': 'version:2@5.4.0.cr1', + 'version': 'version:2@5.11.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_mockito_mockito_subclass': { + 'src/third_party/android_deps/cipd/libs/org_mockito_mockito_subclass': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_mockito_mockito_subclass', - 'version': 'version:2@5.4.0.cr1', + 'version': 'version:2@5.11.0.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_objenesis_objenesis': { + 'src/third_party/android_deps/cipd/libs/org_objenesis_objenesis': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_objenesis_objenesis', 'version': 'version:2@3.3.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_ow2_asm_asm': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm', - 'version': 'version:2@9.5.cr1', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_ow2_asm_asm_analysis': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_analysis': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_analysis', - 'version': 'version:2@9.5.cr1', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_ow2_asm_asm_commons': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_commons': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_commons', - 'version': 'version:2@9.5.cr1', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_ow2_asm_asm_tree': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_tree': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_tree', - 'version': 'version:2@9.5.cr1', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_ow2_asm_asm_util': { + 'src/third_party/android_deps/cipd/libs/org_ow2_asm_asm_util': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_ow2_asm_asm_util', - 'version': 'version:2@9.5.cr1', + 'version': 'version:2@9.7.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_pcollections_pcollections': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_pcollections_pcollections', - 'version': 'version:2@3.1.4.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_annotations': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_annotations', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_junit': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_junit': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_junit', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_nativeruntime': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_nativeruntime': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_nativeruntime_dist_compat': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_nativeruntime_dist_compat': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_nativeruntime_dist_compat', - 'version': 'version:2@1.0.1.cr1', + 'version': 'version:2@1.0.16.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_pluginapi': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_pluginapi': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_pluginapi', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_plugins_maven_dependency_resolver': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_plugins_maven_dependency_resolver', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_resources': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_resources': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_resources', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_robolectric': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_robolectric': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_robolectric', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_sandbox': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_sandbox': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_sandbox', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_shadowapi': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_shadowapi': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadowapi', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_shadows_framework': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_shadows_framework': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_framework', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_shadows_playservices': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/org_robolectric_shadows_playservices', - 'version': 'version:2@4.10.3.cr1', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/org_robolectric_utils': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_utils': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_robolectric_utils_reflector': { + 'src/third_party/android_deps/cipd/libs/org_robolectric_utils_reflector': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/org_robolectric_utils_reflector', - 'version': 'version:2@4.10.3.cr1', + 'version': 'version:2@4.14.1.cr1', }, ], - 'condition': 'checkout_android', + 'condition': 'checkout_android and non_git_source', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/cipd/libs/org_yaml_snakeyaml': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_yaml_snakeyaml', + 'version': 'version:2@2.3.cr1', + }, + ], + 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, @@ -2387,54 +1822,6 @@ hooks = [ 'action': ['python3', 'src/build/mac_toolchain.py'], 'condition': 'checkout_mac', }, - { - 'name': 'msan_chained_origins_focal', - 'pattern': '.', - 'condition': 'checkout_instrumented_libraries', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-instrumented-libraries', - '-s', 'src/third_party/instrumented_libraries/binaries/msan-chained-origins-focal.tgz.sha1', - ], - }, - { - 'name': 'msan_no_origins_focal', - 'pattern': '.', - 'condition': 'checkout_instrumented_libraries', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-instrumented-libraries', - '-s', 'src/third_party/instrumented_libraries/binaries/msan-no-origins-focal.tgz.sha1', - ], - }, - { - 'name': 'msan_chained_origins_focal', - 'pattern': '.', - 'condition': 'checkout_instrumented_libraries', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-instrumented-libraries', - '-s', 'src/third_party/instrumented_libraries/binaries/msan-chained-origins-focal.tgz.sha1', - ], - }, - { - 'name': 'msan_no_origins_focal', - 'pattern': '.', - 'condition': 'checkout_instrumented_libraries', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-instrumented-libraries', - '-s', 'src/third_party/instrumented_libraries/binaries/msan-no-origins-focal.tgz.sha1', - ], - }, { 'name': 'Download Fuchsia SDK from GCS', 'pattern': '.', @@ -2470,60 +1857,6 @@ hooks = [ 'action': ['python3', 'src/build/util/lastchange.py', '-o', 'src/build/util/LASTCHANGE'], }, - # Pull clang-format binaries using checked-in hashes. - { - 'name': 'clang_format_win', - 'pattern': '.', - 'condition': 'host_os == "win"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--platform=win32', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'src/buildtools/win/clang-format.exe.sha1', - ], - }, - { - 'name': 'clang_format_mac_x64', - 'pattern': '.', - 'condition': 'host_os == "mac" and host_cpu == "x64"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--platform=darwin', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'src/buildtools/mac/clang-format.x64.sha1', - '-o', 'src/buildtools/mac/clang-format', - ], - }, - { - 'name': 'clang_format_mac_arm64', - 'pattern': '.', - 'condition': 'host_os == "mac" and host_cpu == "arm64"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'src/buildtools/mac/clang-format.arm64.sha1', - '-o', 'src/buildtools/mac/clang-format', - ], - }, - { - 'name': 'clang_format_linux', - 'pattern': '.', - 'condition': 'host_os == "linux"', - 'action': [ 'python3', - 'src/third_party/depot_tools/download_from_google_storage.py', - '--no_resume', - '--platform=linux*', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'src/buildtools/linux64/clang-format.sha1', - ], - }, # Pull luci-go binaries (isolate, swarming) using checked-in hashes. { 'name': 'luci-go_win', @@ -2586,4 +1919,7 @@ hooks = [ }, ] -recursedeps = [] +recursedeps = [ + 'src/buildtools', + 'src/third_party/instrumented_libs', +] diff --git a/build_overrides/build.gni b/build_overrides/build.gni index d9d01d51b..1613440b0 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -35,12 +35,13 @@ ignore_elf32_limitations = true # Use bundled hermetic Xcode installation maintained by Chromium, # except for local iOS builds where it is unsupported. -if (host_os == "mac") { +# Allow for mac cross compile on linux machines. +if (host_os == "mac" || host_os == "linux") { _result = exec_script("//build/mac/should_use_hermetic_xcode.py", [ target_os ], "value") assert(_result != 2, - "Do not allow building targets with the default" + + "Do not allow building targets with the default " + "hermetic toolchain if the minimum OS version is not met.") use_system_xcode = _result == 0 } diff --git a/tools_libyuv/autoroller/roll_deps.py b/tools_libyuv/autoroller/roll_deps.py index ccc29ebe8..5c5a65d71 100755 --- a/tools_libyuv/autoroller/roll_deps.py +++ b/tools_libyuv/autoroller/roll_deps.py @@ -55,8 +55,6 @@ LIBYUV_ONLY_DEPS = [ 'src/testing', 'src/third_party', 'src/third_party/android_support_test_runner', - 'src/third_party/bazel', - 'src/third_party/bouncycastle', 'src/third_party/errorprone/lib', 'src/third_party/findbugs', 'src/third_party/gson',