BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 299 insertions, 254 deletions

diff --git a/chromium/third_party/android_deps/BUILD.gn b/chromium/third_party/android_deps/BUILD.gn
index 1644bdee37f..895278aaab4 100644
--- a/chromium/third_party/android_deps/BUILD.gn
+++ b/chromium/third_party/android_deps/BUILD.gn
@@ -25,11 +25,46 @@ java_group("android_support_v7_appcompat_java") {
   deps = [
     ":android_support_v4_java",
     ":androidx_appcompat_appcompat_java",
+    ":androidx_appcompat_appcompat_resources_java",
     ":androidx_vectordrawable_vectordrawable_animated_java",
     ":androidx_vectordrawable_vectordrawable_java",
   ]
 }
 
+java_group("espresso_java") {
+  testonly = true
+
+  # TODO(crbug.com/1005891): Update to use espresso targets below once androidx
+  #     test_runner is used.
+  deps = [ "//third_party/espresso:espresso_all_java" ]
+}
+
+java_group("robolectric_all_java") {
+  testonly = true
+  deps = [
+    ":org_robolectric_annotations_java",
+    ":org_robolectric_junit_java",
+    ":org_robolectric_pluginapi_java",
+    ":org_robolectric_plugins_maven_dependency_resolver_java",
+    ":org_robolectric_resources_java",
+    ":org_robolectric_robolectric_java",
+    ":org_robolectric_sandbox_java",
+    ":org_robolectric_shadowapi_java",
+    ":org_robolectric_shadows_framework_java",
+    ":org_robolectric_shadows_multidex_java",
+    ":org_robolectric_shadows_playservices_java",
+    ":org_robolectric_utils_java",
+    ":org_robolectric_utils_reflector_java",
+    "//third_party/robolectric:android-all-10-robolectric-5803371_java",
+    "//third_party/robolectric:android-all-4.4_r1-robolectric-r2_java",
+    "//third_party/robolectric:android-all-5.0.2_r3-robolectric-r0_java",
+    "//third_party/robolectric:android-all-7.1.0_r7-robolectric-r1_java",
+    "//third_party/robolectric:android-all-8.0.0_r4-robolectric-r1_java",
+    "//third_party/robolectric:android-all-8.1.0-robolectric-4611349_java",
+    "//third_party/robolectric:android-all-9-robolectric-4913185-2_java",
+  ]
+}
+
 # The dependencies below are used by chromecast internal.
 java_group("android_support_v7_preference_java") {
   deps = [ ":androidx_preference_preference_java" ]
@@ -54,12 +89,6 @@ java_annotation_processor("dagger_processor") {
   deps = [ ":com_google_dagger_dagger_compiler_java" ]
 }
 
-# Alias new java lite runtime to old javalite runtime name until
-# crbug.com/1093059 is fixed and we go back to the latest runtime.
-java_group("com_google_protobuf_protobuf_javalite_java") {
-  deps = [ ":com_google_protobuf_protobuf_lite_cr1_java" ]
-}
-
 # The section below is generated by running
 # `//tools/android/roll/android_deps/fetch_all.py`
 
@@ -70,7 +99,6 @@ java_prebuilt("android_arch_lifecycle_common_java") {
   output_name = "android_arch_lifecycle_common"
   supports_android = true
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -82,7 +110,6 @@ java_prebuilt("android_arch_lifecycle_common_java8_java") {
     ":android_arch_lifecycle_common_java",
     ":com_android_support_support_annotations_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -95,7 +122,6 @@ android_aar_prebuilt("android_arch_lifecycle_runtime_java") {
     ":android_arch_lifecycle_common_java",
     ":com_android_support_support_annotations_java",
   ]
-  skip_jetify = true
 
   # https://crbug.com/887942#c1
   ignore_proguard_configs = true
@@ -106,7 +132,6 @@ android_aar_prebuilt("android_arch_lifecycle_viewmodel_java") {
   aar_path = "libs/android_arch_lifecycle_viewmodel/viewmodel-1.1.1.aar"
   info_path = "libs/android_arch_lifecycle_viewmodel/android_arch_lifecycle_viewmodel.info"
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 
   # https://crbug.com/887942#c1
   ignore_proguard_configs = true
@@ -117,7 +142,6 @@ java_prebuilt("androidx_annotation_annotation_java") {
   jar_path = "libs/androidx_annotation_annotation/annotation-1.1.0.jar"
   output_name = "androidx_annotation_annotation"
   supports_android = true
-  skip_jetify = true
 
   # https://crbug.com/989505
   jar_excluded_patterns = [ "META-INF/proguard/*" ]
@@ -137,7 +161,19 @@ android_aar_prebuilt("androidx_appcompat_appcompat_java") {
     ":androidx_drawerlayout_drawerlayout_java",
     ":androidx_fragment_fragment_java",
   ]
-  skip_jetify = true
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_appcompat_appcompat_resources_java") {
+  aar_path = "libs/androidx_appcompat_appcompat_resources/appcompat-resources-1.2.0-beta01.aar"
+  info_path = "libs/androidx_appcompat_appcompat_resources/androidx_appcompat_appcompat_resources.info"
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
+    ":androidx_vectordrawable_vectordrawable_animated_java",
+    ":androidx_vectordrawable_vectordrawable_java",
+  ]
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -148,7 +184,6 @@ android_aar_prebuilt("androidx_asynclayoutinflater_asynclayoutinflater_java") {
     ":androidx_annotation_annotation_java",
     ":androidx_core_core_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -156,7 +191,6 @@ android_aar_prebuilt("androidx_cardview_cardview_java") {
   aar_path = "libs/androidx_cardview_cardview/cardview-1.0.0.aar"
   info_path = "libs/androidx_cardview_cardview/androidx_cardview_cardview.info"
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -165,7 +199,6 @@ java_prebuilt("androidx_collection_collection_java") {
   output_name = "androidx_collection_collection"
   supports_android = true
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -178,19 +211,18 @@ java_prebuilt("androidx_concurrent_concurrent_futures_java") {
     ":androidx_annotation_annotation_java",
     ":com_google_guava_listenablefuture_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_coordinatorlayout_coordinatorlayout_java") {
-  aar_path = "libs/androidx_coordinatorlayout_coordinatorlayout/coordinatorlayout-1.0.0.aar"
+  aar_path = "libs/androidx_coordinatorlayout_coordinatorlayout/coordinatorlayout-1.1.0.aar"
   info_path = "libs/androidx_coordinatorlayout_coordinatorlayout/androidx_coordinatorlayout_coordinatorlayout.info"
   deps = [
     ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
     ":androidx_core_core_java",
     ":androidx_customview_customview_java",
   ]
-  skip_jetify = true
 
   # https:crbug.com/954584
   ignore_proguard_configs = true
@@ -206,7 +238,6 @@ android_aar_prebuilt("androidx_core_core_java") {
     ":androidx_lifecycle_lifecycle_runtime_java",
     ":androidx_versionedparcelable_versionedparcelable_java",
   ]
-  skip_jetify = true
 
   # Target has AIDL, but we do not support it yet: http://crbug.com/644439
   ignore_aidl = true
@@ -229,7 +260,6 @@ android_aar_prebuilt("androidx_customview_customview_java") {
     ":androidx_annotation_annotation_java",
     ":androidx_core_core_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -241,23 +271,25 @@ android_aar_prebuilt("androidx_drawerlayout_drawerlayout_java") {
     ":androidx_core_core_java",
     ":androidx_customview_customview_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_fragment_fragment_java") {
-  aar_path = "libs/androidx_fragment_fragment/fragment-1.1.0.aar"
+  aar_path = "libs/androidx_fragment_fragment/fragment-1.2.5.aar"
   info_path = "libs/androidx_fragment_fragment/androidx_fragment_fragment.info"
   deps = [
     ":androidx_activity_activity_java",
     ":androidx_annotation_annotation_java",
     ":androidx_collection_collection_java",
     ":androidx_core_core_java",
+    ":androidx_lifecycle_lifecycle_livedata_core_java",
     ":androidx_lifecycle_lifecycle_viewmodel_java",
+    ":androidx_lifecycle_lifecycle_viewmodel_savedstate_java",
     ":androidx_loader_loader_java",
     ":androidx_viewpager_viewpager_java",
   ]
-  skip_jetify = true
+
+  ignore_proguard_configs = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -269,7 +301,6 @@ android_aar_prebuilt("androidx_gridlayout_gridlayout_java") {
     ":androidx_core_core_java",
     ":androidx_legacy_legacy_support_core_ui_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -277,7 +308,6 @@ android_aar_prebuilt("androidx_interpolator_interpolator_java") {
   aar_path = "libs/androidx_interpolator_interpolator/interpolator-1.0.0.aar"
   info_path = "libs/androidx_interpolator_interpolator/androidx_interpolator_interpolator.info"
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -293,7 +323,6 @@ android_aar_prebuilt("androidx_leanback_leanback_preference_java") {
     ":androidx_preference_preference_java",
     ":androidx_recyclerview_recyclerview_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -314,7 +343,6 @@ android_aar_prebuilt("androidx_legacy_legacy_support_core_ui_java") {
     ":androidx_swiperefreshlayout_swiperefreshlayout_java",
     ":androidx_viewpager_viewpager_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -329,7 +357,6 @@ android_aar_prebuilt("androidx_legacy_legacy_support_core_utils_java") {
     ":androidx_localbroadcastmanager_localbroadcastmanager_java",
     ":androidx_print_print_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -338,7 +365,6 @@ android_aar_prebuilt("androidx_legacy_legacy_support_v13_java") {
       "libs/androidx_legacy_legacy_support_v13/legacy-support-v13-1.0.0.aar"
   info_path = "libs/androidx_legacy_legacy_support_v13/androidx_legacy_legacy_support_v13.info"
   deps = [ ":androidx_legacy_legacy_support_v4_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -353,17 +379,15 @@ android_aar_prebuilt("androidx_legacy_legacy_support_v4_java") {
     ":androidx_legacy_legacy_support_core_utils_java",
     ":androidx_media_media_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("androidx_lifecycle_lifecycle_common_java") {
   jar_path =
-      "libs/androidx_lifecycle_lifecycle_common/lifecycle-common-2.1.0.jar"
+      "libs/androidx_lifecycle_lifecycle_common/lifecycle-common-2.2.0.jar"
   output_name = "androidx_lifecycle_lifecycle_common"
   supports_android = true
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -375,20 +399,18 @@ java_prebuilt("androidx_lifecycle_lifecycle_common_java8_java") {
     ":androidx_annotation_annotation_java",
     ":androidx_lifecycle_lifecycle_common_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_lifecycle_lifecycle_runtime_java") {
   aar_path =
-      "libs/androidx_lifecycle_lifecycle_runtime/lifecycle-runtime-2.1.0.aar"
+      "libs/androidx_lifecycle_lifecycle_runtime/lifecycle-runtime-2.2.0.aar"
   info_path = "libs/androidx_lifecycle_lifecycle_runtime/androidx_lifecycle_lifecycle_runtime.info"
   deps = [
     ":androidx_annotation_annotation_java",
     ":androidx_arch_core_core_common_java",
     ":androidx_lifecycle_lifecycle_common_java",
   ]
-  skip_jetify = true
 
   # https://crbug.com/887942#c1
   ignore_proguard_configs = true
@@ -396,10 +418,9 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_runtime_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_lifecycle_lifecycle_viewmodel_java") {
-  aar_path = "libs/androidx_lifecycle_lifecycle_viewmodel/lifecycle-viewmodel-2.1.0.aar"
+  aar_path = "libs/androidx_lifecycle_lifecycle_viewmodel/lifecycle-viewmodel-2.2.0.aar"
   info_path = "libs/androidx_lifecycle_lifecycle_viewmodel/androidx_lifecycle_lifecycle_viewmodel.info"
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 
   # https://crbug.com/887942#c1
   ignore_proguard_configs = true
@@ -411,7 +432,6 @@ android_aar_prebuilt(
   aar_path = "libs/androidx_localbroadcastmanager_localbroadcastmanager/localbroadcastmanager-1.0.0.aar"
   info_path = "libs/androidx_localbroadcastmanager_localbroadcastmanager/androidx_localbroadcastmanager_localbroadcastmanager.info"
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -424,7 +444,6 @@ android_aar_prebuilt("androidx_mediarouter_mediarouter_java") {
     ":androidx_palette_palette_java",
     ":androidx_recyclerview_recyclerview_java",
   ]
-  skip_jetify = true
 
   # https://crbug.com/1000382
   proguard_configs = [ "androidx_mediarouter.flags" ]
@@ -434,35 +453,34 @@ android_aar_prebuilt("androidx_mediarouter_mediarouter_java") {
 android_aar_prebuilt("androidx_multidex_multidex_java") {
   aar_path = "libs/androidx_multidex_multidex/multidex-2.0.0.aar"
   info_path = "libs/androidx_multidex_multidex/androidx_multidex_multidex.info"
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_preference_preference_java") {
-  aar_path = "libs/androidx_preference_preference/preference-1.0.0.aar"
+  aar_path = "libs/androidx_preference_preference/preference-1.1.1.aar"
   info_path =
       "libs/androidx_preference_preference/androidx_preference_preference.info"
   deps = [
+    ":androidx_annotation_annotation_java",
     ":androidx_appcompat_appcompat_java",
     ":androidx_collection_collection_java",
     ":androidx_core_core_java",
     ":androidx_fragment_fragment_java",
     ":androidx_recyclerview_recyclerview_java",
   ]
-  skip_jetify = true
   ignore_proguard_configs = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_recyclerview_recyclerview_java") {
-  aar_path = "libs/androidx_recyclerview_recyclerview/recyclerview-1.0.0.aar"
+  aar_path = "libs/androidx_recyclerview_recyclerview/recyclerview-1.1.0.aar"
   info_path = "libs/androidx_recyclerview_recyclerview/androidx_recyclerview_recyclerview.info"
   deps = [
     ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
     ":androidx_core_core_java",
-    ":androidx_legacy_legacy_support_core_ui_java",
+    ":androidx_customview_customview_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -474,7 +492,6 @@ android_aar_prebuilt("androidx_swiperefreshlayout_swiperefreshlayout_java") {
     ":androidx_core_core_java",
     ":androidx_interpolator_interpolator_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -487,12 +504,30 @@ android_aar_prebuilt("androidx_test_core_java") {
     ":androidx_lifecycle_lifecycle_common_java",
     ":androidx_test_monitor_java",
   ]
-  skip_jetify = true
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_test_espresso_espresso_contrib_java") {
+  aar_path =
+      "libs/androidx_test_espresso_espresso_contrib/espresso-contrib-3.2.0.aar"
+  info_path = "libs/androidx_test_espresso_espresso_contrib/androidx_test_espresso_espresso_contrib.info"
+  testonly = true
+  deps = [
+    ":androidx_core_core_java",
+    ":androidx_drawerlayout_drawerlayout_java",
+    ":androidx_legacy_legacy_support_core_utils_java",
+    ":androidx_recyclerview_recyclerview_java",
+    ":androidx_test_espresso_espresso_core_java",
+    ":androidx_test_espresso_espresso_idling_resource_java",
+    ":androidx_viewpager_viewpager_java",
+    ":com_google_android_material_material_java",
+    "//third_party/accessibility_test_framework:accessibility_test_framework_java",
+  ]
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_test_espresso_espresso_core_java") {
-  aar_path = "libs/androidx_test_espresso_espresso_core/espresso-core-3.1.0.aar"
+  aar_path = "libs/androidx_test_espresso_espresso_core/espresso-core-3.2.0.aar"
   info_path = "libs/androidx_test_espresso_espresso_core/androidx_test_espresso_espresso_core.info"
   testonly = true
   deps = [
@@ -504,7 +539,32 @@ android_aar_prebuilt("androidx_test_espresso_espresso_core_java") {
     "//third_party/hamcrest:hamcrest_integration_java",
     "//third_party/hamcrest:hamcrest_library_java",
   ]
-  skip_jetify = true
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_test_espresso_espresso_intents_java") {
+  aar_path =
+      "libs/androidx_test_espresso_espresso_intents/espresso-intents-3.2.0.aar"
+  info_path = "libs/androidx_test_espresso_espresso_intents/androidx_test_espresso_espresso_intents.info"
+  testonly = true
+  deps = [
+    ":androidx_test_core_java",
+    ":androidx_test_espresso_espresso_core_java",
+    ":androidx_test_rules_java",
+  ]
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_test_espresso_espresso_web_java") {
+  aar_path = "libs/androidx_test_espresso_espresso_web/espresso-web-3.2.0.aar"
+  info_path = "libs/androidx_test_espresso_espresso_web/androidx_test_espresso_espresso_web.info"
+  testonly = true
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_test_espresso_espresso_core_java",
+    ":org_ccil_cowan_tagsoup_tagsoup_java",
+  ]
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -518,7 +578,6 @@ android_aar_prebuilt("androidx_test_ext_junit_java") {
     ":androidx_test_monitor_java",
     "//third_party/junit:junit",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -527,7 +586,6 @@ android_aar_prebuilt("androidx_test_monitor_java") {
   info_path = "libs/androidx_test_monitor/androidx_test_monitor.info"
   testonly = true
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -536,7 +594,6 @@ android_aar_prebuilt("androidx_test_rules_java") {
   info_path = "libs/androidx_test_rules/androidx_test_rules.info"
   testonly = true
   deps = [ ":androidx_test_runner_java" ]
-  skip_jetify = true
   deps += [
     "//third_party/android_sdk:android_test_base_java",
     "//third_party/android_sdk:android_test_mock_java",
@@ -555,7 +612,6 @@ android_aar_prebuilt("androidx_test_runner_java") {
     ":net_sf_kxml_kxml2_java",
     "//third_party/junit:junit",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -563,7 +619,6 @@ android_aar_prebuilt("androidx_test_uiautomator_uiautomator_java") {
   aar_path = "libs/androidx_test_uiautomator_uiautomator/uiautomator-2.2.0.aar"
   info_path = "libs/androidx_test_uiautomator_uiautomator/androidx_test_uiautomator_uiautomator.info"
   testonly = true
-  skip_jetify = true
   deps = [ ":androidx_test_runner_java" ]
 }
 
@@ -576,7 +631,6 @@ android_aar_prebuilt("androidx_tvprovider_tvprovider_java") {
     ":androidx_annotation_annotation_java",
     ":androidx_core_core_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -589,7 +643,6 @@ android_aar_prebuilt("androidx_vectordrawable_vectordrawable_java") {
     ":androidx_collection_collection_java",
     ":androidx_core_core_java",
   ]
-  skip_jetify = true
   create_srcjar = false
 }
 
@@ -602,7 +655,6 @@ android_aar_prebuilt("androidx_vectordrawable_vectordrawable_animated_java") {
     ":androidx_interpolator_interpolator_java",
     ":androidx_vectordrawable_vectordrawable_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -615,7 +667,6 @@ android_aar_prebuilt("androidx_viewpager_viewpager_java") {
     ":androidx_core_core_java",
     ":androidx_customview_customview_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -632,7 +683,6 @@ android_aar_prebuilt("com_android_support_appcompat_v7_java") {
     ":com_android_support_support_fragment_java",
     ":com_android_support_support_vector_drawable_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -643,7 +693,6 @@ android_aar_prebuilt("com_android_support_asynclayoutinflater_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -651,7 +700,6 @@ android_aar_prebuilt("com_android_support_cardview_v7_java") {
   aar_path = "libs/com_android_support_cardview_v7/cardview-v7-28.0.0.aar"
   info_path = "libs/com_android_support_cardview_v7/com_android_support_cardview_v7.info"
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -660,7 +708,6 @@ java_prebuilt("com_android_support_collections_java") {
   output_name = "com_android_support_collections"
   supports_android = true
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -673,7 +720,6 @@ android_aar_prebuilt("com_android_support_coordinatorlayout_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
 
   # https:crbug.com/954584
   ignore_proguard_configs = true
@@ -688,7 +734,6 @@ android_aar_prebuilt("com_android_support_customview_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -706,7 +751,6 @@ android_aar_prebuilt("com_android_support_design_java") {
     ":com_android_support_support_fragment_java",
     ":com_android_support_transition_java",
   ]
-  skip_jetify = true
 
   # Reduce binary size. https:crbug.com/954584
   ignore_proguard_configs = true
@@ -721,7 +765,6 @@ android_aar_prebuilt("com_android_support_drawerlayout_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -732,7 +775,6 @@ android_aar_prebuilt("com_android_support_gridlayout_v7_java") {
     ":com_android_support_support_compat_java",
     ":com_android_support_support_core_ui_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -740,7 +782,6 @@ android_aar_prebuilt("com_android_support_interpolator_java") {
   aar_path = "libs/com_android_support_interpolator/interpolator-28.0.0.aar"
   info_path = "libs/com_android_support_interpolator/com_android_support_interpolator.info"
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -748,7 +789,6 @@ android_aar_prebuilt("com_android_support_localbroadcastmanager_java") {
   aar_path = "libs/com_android_support_localbroadcastmanager/localbroadcastmanager-28.0.0.aar"
   info_path = "libs/com_android_support_localbroadcastmanager/com_android_support_localbroadcastmanager.info"
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -761,7 +801,6 @@ android_aar_prebuilt("com_android_support_mediarouter_v7_java") {
     ":com_android_support_recyclerview_v7_java",
     ":com_android_support_support_media_compat_java",
   ]
-  skip_jetify = true
 
   # https://crbug.com/1000382
   proguard_configs = [ "support_mediarouter.flags" ]
@@ -772,7 +811,6 @@ android_aar_prebuilt("com_android_support_multidex_java") {
   aar_path = "libs/com_android_support_multidex/multidex-1.0.0.aar"
   info_path =
       "libs/com_android_support_multidex/com_android_support_multidex.info"
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -787,7 +825,6 @@ android_aar_prebuilt("com_android_support_preference_leanback_v17_java") {
     ":com_android_support_preference_v7_java",
     ":com_android_support_recyclerview_v7_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -801,7 +838,6 @@ android_aar_prebuilt("com_android_support_preference_v7_java") {
     ":com_android_support_support_compat_java",
     ":com_android_support_support_fragment_java",
   ]
-  skip_jetify = true
   ignore_proguard_configs = true
 }
 
@@ -815,7 +851,6 @@ android_aar_prebuilt("com_android_support_recyclerview_v7_java") {
     ":com_android_support_support_compat_java",
     ":com_android_support_support_core_ui_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -823,7 +858,6 @@ java_prebuilt("com_android_support_support_annotations_java") {
   jar_path = "libs/com_android_support_support_annotations/support-annotations-28.0.0.jar"
   output_name = "com_android_support_support_annotations"
   supports_android = true
-  skip_jetify = true
 
   # https://crbug.com/989505
   jar_excluded_patterns = [ "META-INF/proguard/*" ]
@@ -839,7 +873,6 @@ android_aar_prebuilt("com_android_support_support_compat_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_versionedparcelable_java",
   ]
-  skip_jetify = true
 
   # Target has AIDL, but we do not support it yet: http://crbug.com/644439
   ignore_aidl = true
@@ -873,7 +906,6 @@ android_aar_prebuilt("com_android_support_support_core_ui_java") {
     ":com_android_support_swiperefreshlayout_java",
     ":com_android_support_viewpager_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -888,7 +920,6 @@ android_aar_prebuilt("com_android_support_support_core_utils_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -904,7 +935,6 @@ android_aar_prebuilt("com_android_support_support_fragment_java") {
     ":com_android_support_support_core_ui_java",
     ":com_android_support_support_core_utils_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -912,7 +942,6 @@ android_aar_prebuilt("com_android_support_support_v13_java") {
   aar_path = "libs/com_android_support_support_v13/support-v13-28.0.0.aar"
   info_path = "libs/com_android_support_support_v13/com_android_support_support_v13.info"
   deps = [ ":com_android_support_support_v4_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -927,7 +956,6 @@ android_aar_prebuilt("com_android_support_support_v4_java") {
     ":com_android_support_support_fragment_java",
     ":com_android_support_support_media_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -939,7 +967,6 @@ android_aar_prebuilt("com_android_support_swiperefreshlayout_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -952,14 +979,13 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_android_tools_build_jetifier_jetifier_processor_java") {
   jar_path = "libs/com_android_tools_build_jetifier_jetifier_processor/jetifier-processor-1.0.0-beta08.jar"
   output_name = "com_android_tools_build_jetifier_jetifier_processor"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
   deps = [
     ":com_android_tools_build_jetifier_jetifier_core_java",
     ":org_jdom_jdom2_java",
@@ -968,7 +994,6 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_processor_java") {
     ":org_ow2_asm_asm_java",
     ":org_ow2_asm_asm_util_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1208,18 +1233,22 @@ android_aar_prebuilt("google_play_services_vision_common_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("com_google_android_material_material_java") {
-  aar_path = "libs/com_google_android_material_material/material-1.0.0-rc02.aar"
+  aar_path =
+      "libs/com_google_android_material_material/material-1.2.0-alpha06.aar"
   info_path = "libs/com_google_android_material_material/com_google_android_material_material.info"
   deps = [
+    ":androidx_annotation_annotation_experimental_java",
     ":androidx_annotation_annotation_java",
     ":androidx_appcompat_appcompat_java",
     ":androidx_cardview_cardview_java",
+    ":androidx_coordinatorlayout_coordinatorlayout_java",
     ":androidx_core_core_java",
     ":androidx_fragment_fragment_java",
-    ":androidx_legacy_legacy_support_core_ui_java",
-    ":androidx_legacy_legacy_support_core_utils_java",
+    ":androidx_lifecycle_lifecycle_runtime_java",
     ":androidx_recyclerview_recyclerview_java",
     ":androidx_transition_transition_java",
+    ":androidx_vectordrawable_vectordrawable_java",
+    ":androidx_viewpager2_viewpager2_java",
   ]
 
   # Reduce binary size. https:crbug.com/954584
@@ -1231,7 +1260,7 @@ java_prebuilt("com_google_auto_service_auto_service_java") {
   jar_path =
       "libs/com_google_auto_service_auto_service/auto-service-1.0-rc6.jar"
   output_name = "com_google_auto_service_auto_service"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
   deps = [
     ":com_google_auto_auto_common_java",
     ":com_google_auto_service_auto_service_annotations_java",
@@ -1243,7 +1272,7 @@ java_prebuilt("com_google_auto_service_auto_service_java") {
 java_prebuilt("com_google_auto_service_auto_service_annotations_java") {
   jar_path = "libs/com_google_auto_service_auto_service_annotations/auto-service-annotations-1.0-rc6.jar"
   output_name = "com_google_auto_service_auto_service_annotations"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1253,14 +1282,14 @@ java_prebuilt("com_google_code_findbugs_jsr305_java") {
   supports_android = true
 
   # Needed to break dependency cycle for errorprone_plugin_java.
-  no_build_hooks = true
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_code_gson_gson_java") {
   jar_path = "libs/com_google_code_gson_gson/gson-2.8.0.jar"
   output_name = "com_google_code_gson_gson"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1275,7 +1304,7 @@ java_prebuilt("com_google_dagger_dagger_java") {
 java_prebuilt("com_google_dagger_dagger_compiler_java") {
   jar_path = "libs/com_google_dagger_dagger_compiler/dagger-compiler-2.26.jar"
   output_name = "com_google_dagger_dagger_compiler"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
   deps = [
     ":com_google_code_findbugs_jsr305_java",
     ":com_google_dagger_dagger_java",
@@ -1299,7 +1328,7 @@ java_prebuilt("com_google_errorprone_error_prone_core_java") {
   jar_path =
       "libs/com_google_errorprone_error_prone_core/error_prone_core-2.3.4.jar"
   output_name = "com_google_errorprone_error_prone_core"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
   deps = [
     ":com_google_auto_auto_common_java",
     ":com_google_code_findbugs_jFormatString_java",
@@ -1321,13 +1350,16 @@ java_prebuilt("com_google_guava_failureaccess_java") {
   jar_path = "libs/com_google_guava_failureaccess/failureaccess-1.0.1.jar"
   output_name = "com_google_guava_failureaccess"
   supports_android = true
+
+  # Needed to break dependency cycle for errorprone_plugin_java.
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_guava_guava_java") {
   jar_path = "libs/com_google_guava_guava/guava-27.1-jre.jar"
   output_name = "com_google_guava_guava"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
   deps = [
     ":com_google_code_findbugs_jsr305_java",
     ":com_google_errorprone_error_prone_annotations_java",
@@ -1351,7 +1383,7 @@ java_prebuilt("com_google_guava_listenablefuture_java") {
   supports_android = true
 
   # Needed to break dependency cycle for errorprone_plugin_java.
-  no_build_hooks = true
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1360,12 +1392,16 @@ java_prebuilt("com_google_j2objc_j2objc_annotations_java") {
       "libs/com_google_j2objc_j2objc_annotations/j2objc-annotations-1.1.jar"
   output_name = "com_google_j2objc_j2objc_annotations"
   supports_android = true
+
+  # Needed to break dependency cycle for errorprone_plugin_java.
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("com_google_protobuf_protobuf_lite_cr1_java") {
-  jar_path = "libs/com_google_protobuf_protobuf_lite/protobuf-lite-3.0.1.jar"
-  output_name = "com_google_protobuf_protobuf_lite"
+java_prebuilt("com_google_protobuf_protobuf_javalite_java") {
+  jar_path =
+      "libs/com_google_protobuf_protobuf_javalite/protobuf-javalite-3.12.2.jar"
+  output_name = "com_google_protobuf_protobuf_javalite"
   supports_android = true
 }
 
@@ -1376,21 +1412,21 @@ java_prebuilt("com_googlecode_java_diff_utils_diffutils_java") {
   supports_android = true
 
   # Needed to break dependency cycle for errorprone_plugin_java.
-  no_build_hooks = true
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_squareup_javapoet_java") {
   jar_path = "libs/com_squareup_javapoet/javapoet-1.11.1.jar"
   output_name = "com_squareup_javapoet"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("commons_cli_commons_cli_java") {
   jar_path = "libs/commons_cli_commons_cli/commons-cli-1.3.1.jar"
   output_name = "commons_cli_commons_cli"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1415,17 +1451,25 @@ java_prebuilt("javax_inject_javax_inject_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("org_ccil_cowan_tagsoup_tagsoup_java") {
+  jar_path = "libs/org_ccil_cowan_tagsoup_tagsoup/tagsoup-1.2.1.jar"
+  output_name = "org_ccil_cowan_tagsoup_tagsoup"
+  supports_android = true
+  testonly = true
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_ow2_asm_asm_java") {
   jar_path = "libs/org_ow2_asm_asm/asm-7.0.jar"
   output_name = "org_ow2_asm_asm"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_ow2_asm_asm_commons_java") {
   jar_path = "libs/org_ow2_asm_asm_commons/asm-commons-7.0.jar"
   output_name = "org_ow2_asm_asm_commons"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
   deps = [
     ":org_ow2_asm_asm_analysis_java",
     ":org_ow2_asm_asm_java",
@@ -1437,7 +1481,7 @@ java_prebuilt("org_ow2_asm_asm_commons_java") {
 java_prebuilt("org_ow2_asm_asm_tree_java") {
   jar_path = "libs/org_ow2_asm_asm_tree/asm-tree-7.0.jar"
   output_name = "org_ow2_asm_asm_tree"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
   deps = [ ":org_ow2_asm_asm_java" ]
 }
 
@@ -1445,7 +1489,7 @@ java_prebuilt("org_ow2_asm_asm_tree_java") {
 java_prebuilt("org_ow2_asm_asm_util_java") {
   jar_path = "libs/org_ow2_asm_asm_util/asm-util-7.0.jar"
   output_name = "org_ow2_asm_asm_util"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
   deps = [
     ":org_ow2_asm_asm_analysis_java",
     ":org_ow2_asm_asm_java",
@@ -1457,7 +1501,7 @@ java_prebuilt("org_ow2_asm_asm_util_java") {
 java_prebuilt("org_robolectric_robolectric_java") {
   jar_path = "libs/org_robolectric_robolectric/robolectric-4.3.1.jar"
   output_name = "org_robolectric_robolectric"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
   testonly = true
   deps = [
     ":androidx_test_monitor_java",
@@ -1475,7 +1519,47 @@ java_prebuilt("org_robolectric_robolectric_java") {
     "//third_party/bouncycastle:bouncycastle_java",
   ]
   bypass_platform_checks = true
-  skip_jetify = true
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("org_robolectric_shadows_multidex_java") {
+  jar_path = "libs/org_robolectric_shadows_multidex/shadows-multidex-4.3.1.jar"
+  output_name = "org_robolectric_shadows_multidex"
+  enable_bytecode_checks = false
+  testonly = true
+  deps = [ ":org_robolectric_annotations_java" ]
+  bypass_platform_checks = true
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("org_robolectric_shadows_playservices_java") {
+  jar_path =
+      "libs/org_robolectric_shadows_playservices/shadows-playservices-4.3.1.jar"
+  output_name = "org_robolectric_shadows_playservices"
+  enable_bytecode_checks = false
+  testonly = true
+  deps = [
+    ":com_google_guava_guava_java",
+    ":org_robolectric_annotations_java",
+  ]
+  bypass_platform_checks = true
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("org_robolectric_utils_java") {
+  jar_path = "libs/org_robolectric_utils/utils-4.3.1.jar"
+  output_name = "org_robolectric_utils"
+  enable_bytecode_checks = false
+  testonly = true
+  deps = [
+    ":com_google_auto_service_auto_service_java",
+    ":javax_annotation_javax_annotation_api_java",
+    ":javax_inject_javax_inject_java",
+    ":org_robolectric_annotations_java",
+    ":org_robolectric_pluginapi_java",
+    ":org_robolectric_utils_reflector_java",
+  ]
+  bypass_platform_checks = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1488,7 +1572,6 @@ java_prebuilt("android_arch_core_common_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1503,7 +1586,6 @@ android_aar_prebuilt("android_arch_core_runtime_java") {
     ":android_arch_core_common_java",
     ":com_android_support_support_annotations_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1519,7 +1601,6 @@ android_aar_prebuilt("android_arch_lifecycle_livedata_java") {
     ":android_arch_core_runtime_java",
     ":android_arch_lifecycle_livedata_core_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1535,12 +1616,11 @@ android_aar_prebuilt("android_arch_lifecycle_livedata_core_java") {
     ":android_arch_core_runtime_java",
     ":android_arch_lifecycle_common_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_activity_activity_java") {
-  aar_path = "libs/androidx_activity_activity/activity-1.0.0.aar"
+  aar_path = "libs/androidx_activity_activity/activity-1.1.0.aar"
   info_path = "libs/androidx_activity_activity/androidx_activity_activity.info"
 
   # To remove visibility constraint, add this dependency to
@@ -1551,27 +1631,19 @@ android_aar_prebuilt("androidx_activity_activity_java") {
     ":androidx_core_core_java",
     ":androidx_lifecycle_lifecycle_runtime_java",
     ":androidx_lifecycle_lifecycle_viewmodel_java",
+    ":androidx_lifecycle_lifecycle_viewmodel_savedstate_java",
     ":androidx_savedstate_savedstate_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("androidx_appcompat_appcompat_resources_java") {
-  aar_path = "libs/androidx_appcompat_appcompat_resources/appcompat-resources-1.2.0-beta01.aar"
-  info_path = "libs/androidx_appcompat_appcompat_resources/androidx_appcompat_appcompat_resources.info"
+android_aar_prebuilt("androidx_annotation_annotation_experimental_java") {
+  aar_path = "libs/androidx_annotation_annotation_experimental/annotation-experimental-1.0.0.aar"
+  info_path = "libs/androidx_annotation_annotation_experimental/androidx_annotation_annotation_experimental.info"
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
-  deps = [
-    ":androidx_annotation_annotation_java",
-    ":androidx_collection_collection_java",
-    ":androidx_core_core_java",
-    ":androidx_vectordrawable_vectordrawable_animated_java",
-    ":androidx_vectordrawable_vectordrawable_java",
-  ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1584,12 +1656,11 @@ java_prebuilt("androidx_arch_core_core_common_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_arch_core_core_runtime_java") {
-  aar_path = "libs/androidx_arch_core_core_runtime/core-runtime-2.0.0.aar"
+  aar_path = "libs/androidx_arch_core_core_runtime/core-runtime-2.1.0.aar"
   info_path = "libs/androidx_arch_core_core_runtime/androidx_arch_core_core_runtime.info"
 
   # To remove visibility constraint, add this dependency to
@@ -1599,7 +1670,6 @@ android_aar_prebuilt("androidx_arch_core_core_runtime_java") {
     ":androidx_annotation_annotation_java",
     ":androidx_arch_core_core_common_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1611,7 +1681,6 @@ android_aar_prebuilt("androidx_cursoradapter_cursoradapter_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1623,7 +1692,6 @@ android_aar_prebuilt("androidx_documentfile_documentfile_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1641,7 +1709,6 @@ android_aar_prebuilt("androidx_leanback_leanback_java") {
     ":androidx_media_media_java",
     ":androidx_recyclerview_recyclerview_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1653,7 +1720,6 @@ android_aar_prebuilt("androidx_legacy_legacy_preference_v14_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":androidx_preference_preference_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1670,12 +1736,11 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_livedata_java") {
     ":androidx_arch_core_core_runtime_java",
     ":androidx_lifecycle_lifecycle_livedata_core_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_lifecycle_lifecycle_livedata_core_java") {
-  aar_path = "libs/androidx_lifecycle_lifecycle_livedata_core/lifecycle-livedata-core-2.0.0.aar"
+  aar_path = "libs/androidx_lifecycle_lifecycle_livedata_core/lifecycle-livedata-core-2.2.0.aar"
   info_path = "libs/androidx_lifecycle_lifecycle_livedata_core/androidx_lifecycle_lifecycle_livedata_core.info"
 
   # To remove visibility constraint, add this dependency to
@@ -1686,7 +1751,22 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_livedata_core_java") {
     ":androidx_arch_core_core_runtime_java",
     ":androidx_lifecycle_lifecycle_common_java",
   ]
-  skip_jetify = true
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_lifecycle_lifecycle_viewmodel_savedstate_java") {
+  aar_path = "libs/androidx_lifecycle_lifecycle_viewmodel_savedstate/lifecycle-viewmodel-savedstate-2.2.0.aar"
+  info_path = "libs/androidx_lifecycle_lifecycle_viewmodel_savedstate/androidx_lifecycle_lifecycle_viewmodel_savedstate.info"
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [ ":*" ]
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_lifecycle_lifecycle_livedata_core_java",
+    ":androidx_lifecycle_lifecycle_viewmodel_java",
+    ":androidx_savedstate_savedstate_java",
+  ]
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1703,7 +1783,6 @@ android_aar_prebuilt("androidx_loader_loader_java") {
     ":androidx_lifecycle_lifecycle_livedata_java",
     ":androidx_lifecycle_lifecycle_viewmodel_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1719,7 +1798,6 @@ android_aar_prebuilt("androidx_media_media_java") {
     ":androidx_core_core_java",
     ":androidx_versionedparcelable_versionedparcelable_java",
   ]
-  skip_jetify = true
 
   # Target has AIDL, but we do not support it yet: http://crbug.com/644439
   ignore_aidl = true
@@ -1737,7 +1815,6 @@ android_aar_prebuilt("androidx_palette_palette_java") {
     ":androidx_core_core_java",
     ":androidx_legacy_legacy_support_core_utils_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1749,7 +1826,6 @@ android_aar_prebuilt("androidx_print_print_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":androidx_annotation_annotation_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1766,7 +1842,6 @@ android_aar_prebuilt("androidx_savedstate_savedstate_java") {
     ":androidx_arch_core_core_common_java",
     ":androidx_lifecycle_lifecycle_common_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1782,24 +1857,22 @@ android_aar_prebuilt("androidx_slidingpanelayout_slidingpanelayout_java") {
     ":androidx_core_core_java",
     ":androidx_customview_customview_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_test_espresso_espresso_idling_resource_java") {
-  aar_path = "libs/androidx_test_espresso_espresso_idling_resource/espresso-idling-resource-3.1.0.aar"
+  aar_path = "libs/androidx_test_espresso_espresso_idling_resource/espresso-idling-resource-3.2.0.aar"
   info_path = "libs/androidx_test_espresso_espresso_idling_resource/androidx_test_espresso_espresso_idling_resource.info"
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   testonly = true
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_transition_transition_java") {
-  aar_path = "libs/androidx_transition_transition/transition-1.0.0-rc02.aar"
+  aar_path = "libs/androidx_transition_transition/transition-1.2.0.aar"
   info_path =
       "libs/androidx_transition_transition/androidx_transition_transition.info"
 
@@ -1808,9 +1881,9 @@ android_aar_prebuilt("androidx_transition_transition_java") {
   visibility = [ ":*" ]
   deps = [
     ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
     ":androidx_core_core_java",
   ]
-  skip_jetify = true
   deps += [ ":androidx_fragment_fragment_java" ]
 }
 
@@ -1826,17 +1899,34 @@ android_aar_prebuilt("androidx_versionedparcelable_versionedparcelable_java") {
     ":androidx_annotation_annotation_java",
     ":androidx_collection_collection_java",
   ]
-  skip_jetify = true
 
   # Target has AIDL, but we do not support it yet: http://crbug.com/644439
   ignore_aidl = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_viewpager2_viewpager2_java") {
+  aar_path = "libs/androidx_viewpager2_viewpager2/viewpager2-1.0.0.aar"
+  info_path =
+      "libs/androidx_viewpager2_viewpager2/androidx_viewpager2_viewpager2.info"
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [ ":*" ]
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
+    ":androidx_fragment_fragment_java",
+    ":androidx_recyclerview_recyclerview_java",
+  ]
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("backport_util_concurrent_backport_util_concurrent_java") {
   jar_path = "libs/backport_util_concurrent_backport_util_concurrent/backport-util-concurrent-3.1.jar"
   output_name = "backport_util_concurrent_backport_util_concurrent"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -1848,7 +1938,7 @@ java_prebuilt("backport_util_concurrent_backport_util_concurrent_java") {
 java_prebuilt("classworlds_classworlds_java") {
   jar_path = "libs/classworlds_classworlds/classworlds-1.1-alpha-2.jar"
   output_name = "classworlds_classworlds"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -1868,7 +1958,6 @@ android_aar_prebuilt("com_android_support_animated_vector_drawable_java") {
     ":com_android_support_support_core_ui_java",
     ":com_android_support_support_vector_drawable_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1880,7 +1969,6 @@ android_aar_prebuilt("com_android_support_cursoradapter_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1892,7 +1980,6 @@ android_aar_prebuilt("com_android_support_documentfile_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1910,7 +1997,6 @@ android_aar_prebuilt("com_android_support_leanback_v17_java") {
     ":com_android_support_support_fragment_java",
     ":com_android_support_support_media_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1927,7 +2013,6 @@ android_aar_prebuilt("com_android_support_loader_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1943,7 +2028,6 @@ android_aar_prebuilt("com_android_support_palette_v7_java") {
     ":com_android_support_support_compat_java",
     ":com_android_support_support_core_utils_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1955,7 +2039,6 @@ android_aar_prebuilt("com_android_support_preference_v14_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":com_android_support_preference_v7_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1967,7 +2050,6 @@ android_aar_prebuilt("com_android_support_print_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [ ":com_android_support_support_annotations_java" ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -1984,7 +2066,6 @@ android_aar_prebuilt("com_android_support_slidingpanelayout_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -2000,7 +2081,6 @@ android_aar_prebuilt("com_android_support_support_media_compat_java") {
     ":com_android_support_support_compat_java",
     ":com_android_support_versionedparcelable_java",
   ]
-  skip_jetify = true
 
   # Target has AIDL, but we do not support it yet: http://crbug.com/644439
   ignore_aidl = true
@@ -2018,7 +2098,6 @@ android_aar_prebuilt("com_android_support_support_vector_drawable_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
   create_srcjar = false
 }
 
@@ -2035,7 +2114,6 @@ android_aar_prebuilt("com_android_support_transition_java") {
     ":com_android_support_support_annotations_java",
     ":com_android_support_support_compat_java",
   ]
-  skip_jetify = true
   deps += [ ":com_android_support_support_fragment_java" ]
 }
 
@@ -2051,7 +2129,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
     ":com_android_support_collections_java",
     ":com_android_support_support_annotations_java",
   ]
-  skip_jetify = true
 
   # Target has AIDL, but we do not support it yet: http://crbug.com/644439
   ignore_aidl = true
@@ -2065,7 +2142,7 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
 java_prebuilt("com_android_tools_build_jetifier_jetifier_core_java") {
   jar_path = "libs/com_android_tools_build_jetifier_jetifier_core/jetifier-core-1.0.0-beta08.jar"
   output_name = "com_android_tools_build_jetifier_jetifier_core"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2074,14 +2151,13 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_core_java") {
     ":com_google_code_gson_gson_java",
     ":org_jetbrains_kotlin_kotlin_stdlib_java",
   ]
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_github_ben_manes_caffeine_caffeine_java") {
   jar_path = "libs/com_github_ben_manes_caffeine_caffeine/caffeine-2.7.0.jar"
   output_name = "com_github_ben_manes_caffeine_caffeine"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2096,7 +2172,7 @@ java_prebuilt("com_github_ben_manes_caffeine_caffeine_java") {
 java_prebuilt("com_github_kevinstern_software_and_algorithms_java") {
   jar_path = "libs/com_github_kevinstern_software_and_algorithms/software-and-algorithms-1.0.jar"
   output_name = "com_github_kevinstern_software_and_algorithms"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2194,7 +2270,7 @@ android_aar_prebuilt("google_play_services_stats_java") {
 java_prebuilt("com_google_auto_auto_common_java") {
   jar_path = "libs/com_google_auto_auto_common/auto-common-0.10.jar"
   output_name = "com_google_auto_auto_common"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2207,7 +2283,7 @@ java_prebuilt("com_google_code_findbugs_jFormatString_java") {
   jar_path =
       "libs/com_google_code_findbugs_jFormatString/jFormatString-3.0.0.jar"
   output_name = "com_google_code_findbugs_jFormatString"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2218,7 +2294,7 @@ java_prebuilt("com_google_code_findbugs_jFormatString_java") {
 java_prebuilt("com_google_dagger_dagger_producers_java") {
   jar_path = "libs/com_google_dagger_dagger_producers/dagger-producers-2.26.jar"
   output_name = "com_google_dagger_dagger_producers"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2236,7 +2312,7 @@ java_prebuilt("com_google_dagger_dagger_producers_java") {
 java_prebuilt("com_google_dagger_dagger_spi_java") {
   jar_path = "libs/com_google_dagger_dagger_spi/dagger-spi-2.26.jar"
   output_name = "com_google_dagger_dagger_spi"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2256,7 +2332,7 @@ java_prebuilt("com_google_dagger_dagger_spi_java") {
 java_prebuilt("com_google_errorprone_error_prone_annotation_java") {
   jar_path = "libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.3.4.jar"
   output_name = "com_google_errorprone_error_prone_annotation"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2268,7 +2344,7 @@ java_prebuilt("com_google_errorprone_error_prone_annotation_java") {
 java_prebuilt("com_google_errorprone_error_prone_annotations_java") {
   jar_path = "libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.3.4.jar"
   output_name = "com_google_errorprone_error_prone_annotations"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2279,7 +2355,7 @@ java_prebuilt("com_google_errorprone_error_prone_annotations_java") {
 java_prebuilt("com_google_errorprone_error_prone_check_api_java") {
   jar_path = "libs/com_google_errorprone_error_prone_check_api/error_prone_check_api-2.3.4.jar"
   output_name = "com_google_errorprone_error_prone_check_api"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2300,7 +2376,7 @@ java_prebuilt("com_google_errorprone_error_prone_check_api_java") {
 java_prebuilt("com_google_errorprone_error_prone_type_annotations_java") {
   jar_path = "libs/com_google_errorprone_error_prone_type_annotations/error_prone_type_annotations-2.3.4.jar"
   output_name = "com_google_errorprone_error_prone_type_annotations"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2311,7 +2387,7 @@ java_prebuilt("com_google_errorprone_error_prone_type_annotations_java") {
 java_prebuilt("com_google_errorprone_javac_java") {
   jar_path = "libs/com_google_errorprone_javac/javac-9+181-r4173-1.jar"
   output_name = "com_google_errorprone_javac"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2323,7 +2399,7 @@ java_prebuilt("com_google_errorprone_javac_shaded_java") {
   jar_path =
       "libs/com_google_errorprone_javac_shaded/javac-shaded-9-dev-r4023-3.jar"
   output_name = "com_google_errorprone_javac_shaded"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2334,7 +2410,7 @@ java_prebuilt("com_google_errorprone_javac_shaded_java") {
 java_prebuilt("com_google_googlejavaformat_google_java_format_java") {
   jar_path = "libs/com_google_googlejavaformat_google_java_format/google-java-format-1.5.jar"
   output_name = "com_google_googlejavaformat_google_java_format"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2349,7 +2425,7 @@ java_prebuilt("com_google_googlejavaformat_google_java_format_java") {
 java_prebuilt("com_google_protobuf_protobuf_java_java") {
   jar_path = "libs/com_google_protobuf_protobuf_java/protobuf-java-3.4.0.jar"
   output_name = "com_google_protobuf_protobuf_java"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2372,7 +2448,7 @@ java_prebuilt("com_squareup_javawriter_java") {
 java_prebuilt("nekohtml_nekohtml_java") {
   jar_path = "libs/nekohtml_nekohtml/nekohtml-1.9.6.2.jar"
   output_name = "nekohtml_nekohtml"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2384,7 +2460,7 @@ java_prebuilt("nekohtml_nekohtml_java") {
 java_prebuilt("nekohtml_xercesMinimal_java") {
   jar_path = "libs/nekohtml_xercesMinimal/xercesMinimal-1.9.6.2.jar"
   output_name = "nekohtml_xercesMinimal"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2396,7 +2472,7 @@ java_prebuilt("nekohtml_xercesMinimal_java") {
 java_prebuilt("net_ltgt_gradle_incap_incap_java") {
   jar_path = "libs/net_ltgt_gradle_incap_incap/incap-0.2.jar"
   output_name = "net_ltgt_gradle_incap_incap"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2422,7 +2498,7 @@ java_prebuilt("net_sf_kxml_kxml2_java") {
 java_prebuilt("org_apache_ant_ant_java") {
   jar_path = "libs/org_apache_ant_ant/ant-1.8.0.jar"
   output_name = "org_apache_ant_ant"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2435,7 +2511,7 @@ java_prebuilt("org_apache_ant_ant_java") {
 java_prebuilt("org_apache_ant_ant_launcher_java") {
   jar_path = "libs/org_apache_ant_ant_launcher/ant-launcher-1.8.0.jar"
   output_name = "org_apache_ant_ant_launcher"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2447,7 +2523,7 @@ java_prebuilt("org_apache_ant_ant_launcher_java") {
 java_prebuilt("org_apache_maven_maven_ant_tasks_java") {
   jar_path = "libs/org_apache_maven_maven_ant_tasks/maven-ant-tasks-2.1.3.jar"
   output_name = "org_apache_maven_maven_ant_tasks"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2475,7 +2551,7 @@ java_prebuilt("org_apache_maven_maven_ant_tasks_java") {
 java_prebuilt("org_apache_maven_maven_artifact_java") {
   jar_path = "libs/org_apache_maven_maven_artifact/maven-artifact-2.2.1.jar"
   output_name = "org_apache_maven_maven_artifact"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2488,7 +2564,7 @@ java_prebuilt("org_apache_maven_maven_artifact_java") {
 java_prebuilt("org_apache_maven_maven_artifact_manager_java") {
   jar_path = "libs/org_apache_maven_maven_artifact_manager/maven-artifact-manager-2.2.1.jar"
   output_name = "org_apache_maven_maven_artifact_manager"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2508,7 +2584,7 @@ java_prebuilt("org_apache_maven_maven_artifact_manager_java") {
 java_prebuilt("org_apache_maven_maven_error_diagnostics_java") {
   jar_path = "libs/org_apache_maven_maven_error_diagnostics/maven-error-diagnostics-2.2.1.jar"
   output_name = "org_apache_maven_maven_error_diagnostics"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2521,7 +2597,7 @@ java_prebuilt("org_apache_maven_maven_error_diagnostics_java") {
 java_prebuilt("org_apache_maven_maven_model_java") {
   jar_path = "libs/org_apache_maven_maven_model/maven-model-2.2.1.jar"
   output_name = "org_apache_maven_maven_model"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2534,7 +2610,7 @@ java_prebuilt("org_apache_maven_maven_model_java") {
 java_prebuilt("org_apache_maven_maven_plugin_registry_java") {
   jar_path = "libs/org_apache_maven_maven_plugin_registry/maven-plugin-registry-2.2.1.jar"
   output_name = "org_apache_maven_maven_plugin_registry"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2550,7 +2626,7 @@ java_prebuilt("org_apache_maven_maven_plugin_registry_java") {
 java_prebuilt("org_apache_maven_maven_profile_java") {
   jar_path = "libs/org_apache_maven_maven_profile/maven-profile-2.2.1.jar"
   output_name = "org_apache_maven_maven_profile"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2568,7 +2644,7 @@ java_prebuilt("org_apache_maven_maven_profile_java") {
 java_prebuilt("org_apache_maven_maven_project_java") {
   jar_path = "libs/org_apache_maven_maven_project/maven-project-2.2.1.jar"
   output_name = "org_apache_maven_maven_project"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2591,7 +2667,7 @@ java_prebuilt("org_apache_maven_maven_project_java") {
 java_prebuilt("org_apache_maven_maven_repository_metadata_java") {
   jar_path = "libs/org_apache_maven_maven_repository_metadata/maven-repository-metadata-2.2.1.jar"
   output_name = "org_apache_maven_maven_repository_metadata"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2604,7 +2680,7 @@ java_prebuilt("org_apache_maven_maven_repository_metadata_java") {
 java_prebuilt("org_apache_maven_maven_settings_java") {
   jar_path = "libs/org_apache_maven_maven_settings/maven-settings-2.2.1.jar"
   output_name = "org_apache_maven_maven_settings"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2622,7 +2698,7 @@ java_prebuilt("org_apache_maven_maven_settings_java") {
 java_prebuilt("org_apache_maven_wagon_wagon_file_java") {
   jar_path = "libs/org_apache_maven_wagon_wagon_file/wagon-file-1.0-beta-6.jar"
   output_name = "org_apache_maven_wagon_wagon_file"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2635,7 +2711,7 @@ java_prebuilt("org_apache_maven_wagon_wagon_file_java") {
 java_prebuilt("org_apache_maven_wagon_wagon_http_lightweight_java") {
   jar_path = "libs/org_apache_maven_wagon_wagon_http_lightweight/wagon-http-lightweight-1.0-beta-6.jar"
   output_name = "org_apache_maven_wagon_wagon_http_lightweight"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2651,7 +2727,7 @@ java_prebuilt("org_apache_maven_wagon_wagon_http_lightweight_java") {
 java_prebuilt("org_apache_maven_wagon_wagon_http_shared_java") {
   jar_path = "libs/org_apache_maven_wagon_wagon_http_shared/wagon-http-shared-1.0-beta-6.jar"
   output_name = "org_apache_maven_wagon_wagon_http_shared"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2668,7 +2744,7 @@ java_prebuilt("org_apache_maven_wagon_wagon_http_shared_java") {
 java_prebuilt("org_apache_maven_wagon_wagon_provider_api_java") {
   jar_path = "libs/org_apache_maven_wagon_wagon_provider_api/wagon-provider-api-1.0-beta-6.jar"
   output_name = "org_apache_maven_wagon_wagon_provider_api"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2681,7 +2757,7 @@ java_prebuilt("org_apache_maven_wagon_wagon_provider_api_java") {
 java_prebuilt("org_checkerframework_checker_compat_qual_java") {
   jar_path = "libs/org_checkerframework_checker_compat_qual/checker-compat-qual-2.5.3.jar"
   output_name = "org_checkerframework_checker_compat_qual"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2692,7 +2768,7 @@ java_prebuilt("org_checkerframework_checker_compat_qual_java") {
 java_prebuilt("org_checkerframework_checker_qual_java") {
   jar_path = "libs/org_checkerframework_checker_qual/checker-qual-3.0.0.jar"
   output_name = "org_checkerframework_checker_qual"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2703,7 +2779,7 @@ java_prebuilt("org_checkerframework_checker_qual_java") {
 java_prebuilt("org_checkerframework_dataflow_java") {
   jar_path = "libs/org_checkerframework_dataflow/dataflow-3.0.0.jar"
   output_name = "org_checkerframework_dataflow"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2718,7 +2794,7 @@ java_prebuilt("org_checkerframework_dataflow_java") {
 java_prebuilt("org_checkerframework_javacutil_java") {
   jar_path = "libs/org_checkerframework_javacutil/javacutil-3.0.0.jar"
   output_name = "org_checkerframework_javacutil"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2733,7 +2809,7 @@ java_prebuilt("org_checkerframework_javacutil_java") {
 java_prebuilt("org_codehaus_mojo_animal_sniffer_annotations_java") {
   jar_path = "libs/org_codehaus_mojo_animal_sniffer_annotations/animal-sniffer-annotations-1.17.jar"
   output_name = "org_codehaus_mojo_animal_sniffer_annotations"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2744,7 +2820,7 @@ java_prebuilt("org_codehaus_mojo_animal_sniffer_annotations_java") {
 java_prebuilt("org_codehaus_plexus_plexus_container_default_java") {
   jar_path = "libs/org_codehaus_plexus_plexus_container_default/plexus-container-default-1.0-alpha-9-stable-1.jar"
   output_name = "org_codehaus_plexus_plexus_container_default"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2760,7 +2836,7 @@ java_prebuilt("org_codehaus_plexus_plexus_container_default_java") {
 java_prebuilt("org_codehaus_plexus_plexus_interpolation_java") {
   jar_path = "libs/org_codehaus_plexus_plexus_interpolation/plexus-interpolation-1.11.jar"
   output_name = "org_codehaus_plexus_plexus_interpolation"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2772,7 +2848,7 @@ java_prebuilt("org_codehaus_plexus_plexus_interpolation_java") {
 java_prebuilt("org_codehaus_plexus_plexus_utils_java") {
   jar_path = "libs/org_codehaus_plexus_plexus_utils/plexus-utils-1.5.15.jar"
   output_name = "org_codehaus_plexus_plexus_utils"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2784,7 +2860,7 @@ java_prebuilt("org_codehaus_plexus_plexus_utils_java") {
 java_prebuilt("org_jdom_jdom2_java") {
   jar_path = "libs/org_jdom_jdom2/jdom2-2.0.6.jar"
   output_name = "org_jdom_jdom2"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2795,7 +2871,7 @@ java_prebuilt("org_jdom_jdom2_java") {
 java_prebuilt("org_jetbrains_annotations_java") {
   jar_path = "libs/org_jetbrains_annotations/annotations-13.0.jar"
   output_name = "org_jetbrains_annotations"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2806,7 +2882,7 @@ java_prebuilt("org_jetbrains_annotations_java") {
 java_prebuilt("org_jetbrains_kotlin_kotlin_stdlib_java") {
   jar_path = "libs/org_jetbrains_kotlin_kotlin_stdlib/kotlin-stdlib-1.3.50.jar"
   output_name = "org_jetbrains_kotlin_kotlin_stdlib"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2821,7 +2897,7 @@ java_prebuilt("org_jetbrains_kotlin_kotlin_stdlib_java") {
 java_prebuilt("org_jetbrains_kotlin_kotlin_stdlib_common_java") {
   jar_path = "libs/org_jetbrains_kotlin_kotlin_stdlib_common/kotlin-stdlib-common-1.3.50.jar"
   output_name = "org_jetbrains_kotlin_kotlin_stdlib_common"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2832,7 +2908,7 @@ java_prebuilt("org_jetbrains_kotlin_kotlin_stdlib_common_java") {
 java_prebuilt("org_jetbrains_kotlinx_kotlinx_metadata_jvm_java") {
   jar_path = "libs/org_jetbrains_kotlinx_kotlinx_metadata_jvm/kotlinx-metadata-jvm-0.1.0.jar"
   output_name = "org_jetbrains_kotlinx_kotlinx_metadata_jvm"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2844,7 +2920,7 @@ java_prebuilt("org_jetbrains_kotlinx_kotlinx_metadata_jvm_java") {
 java_prebuilt("org_ow2_asm_asm_analysis_java") {
   jar_path = "libs/org_ow2_asm_asm_analysis/asm-analysis-7.0.jar"
   output_name = "org_ow2_asm_asm_analysis"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2856,7 +2932,7 @@ java_prebuilt("org_ow2_asm_asm_analysis_java") {
 java_prebuilt("org_pcollections_pcollections_java") {
   jar_path = "libs/org_pcollections_pcollections/pcollections-2.1.2.jar"
   output_name = "org_pcollections_pcollections"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2867,7 +2943,7 @@ java_prebuilt("org_pcollections_pcollections_java") {
 java_prebuilt("org_plumelib_plume_util_java") {
   jar_path = "libs/org_plumelib_plume_util/plume-util-1.0.6.jar"
   output_name = "org_plumelib_plume_util"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2882,7 +2958,7 @@ java_prebuilt("org_plumelib_plume_util_java") {
 java_prebuilt("org_plumelib_reflection_util_java") {
   jar_path = "libs/org_plumelib_reflection_util/reflection-util-0.0.2.jar"
   output_name = "org_plumelib_reflection_util"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2894,7 +2970,7 @@ java_prebuilt("org_plumelib_reflection_util_java") {
 java_prebuilt("org_plumelib_require_javadoc_java") {
   jar_path = "libs/org_plumelib_require_javadoc/require-javadoc-0.1.0.jar"
   output_name = "org_plumelib_require_javadoc"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2905,21 +2981,20 @@ java_prebuilt("org_plumelib_require_javadoc_java") {
 java_prebuilt("org_robolectric_annotations_java") {
   jar_path = "libs/org_robolectric_annotations/annotations-4.3.1.jar"
   output_name = "org_robolectric_annotations"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   testonly = true
   bypass_platform_checks = true
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_robolectric_junit_java") {
   jar_path = "libs/org_robolectric_junit/junit-4.3.1.jar"
   output_name = "org_robolectric_junit"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2933,14 +3008,13 @@ java_prebuilt("org_robolectric_junit_java") {
     ":org_robolectric_utils_reflector_java",
   ]
   bypass_platform_checks = true
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_robolectric_pluginapi_java") {
   jar_path = "libs/org_robolectric_pluginapi/pluginapi-4.3.1.jar"
   output_name = "org_robolectric_pluginapi"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2952,14 +3026,13 @@ java_prebuilt("org_robolectric_pluginapi_java") {
     ":org_robolectric_annotations_java",
   ]
   bypass_platform_checks = true
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_robolectric_plugins_maven_dependency_resolver_java") {
   jar_path = "libs/org_robolectric_plugins_maven_dependency_resolver/plugins-maven-dependency-resolver-4.3.1.jar"
   output_name = "org_robolectric_plugins_maven_dependency_resolver"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2972,14 +3045,13 @@ java_prebuilt("org_robolectric_plugins_maven_dependency_resolver_java") {
     ":org_robolectric_utils_java",
   ]
   bypass_platform_checks = true
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_robolectric_resources_java") {
   jar_path = "libs/org_robolectric_resources/resources-4.3.1.jar"
   output_name = "org_robolectric_resources"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -2992,14 +3064,13 @@ java_prebuilt("org_robolectric_resources_java") {
     ":org_robolectric_utils_java",
   ]
   bypass_platform_checks = true
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_robolectric_sandbox_java") {
   jar_path = "libs/org_robolectric_sandbox/sandbox-4.3.1.jar"
   output_name = "org_robolectric_sandbox"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -3017,14 +3088,13 @@ java_prebuilt("org_robolectric_sandbox_java") {
     ":org_robolectric_utils_reflector_java",
   ]
   bypass_platform_checks = true
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_robolectric_shadowapi_java") {
   jar_path = "libs/org_robolectric_shadowapi/shadowapi-4.3.1.jar"
   output_name = "org_robolectric_shadowapi"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -3032,7 +3102,6 @@ java_prebuilt("org_robolectric_shadowapi_java") {
   testonly = true
   deps = [ ":org_robolectric_annotations_java" ]
   bypass_platform_checks = true
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -3040,7 +3109,7 @@ java_prebuilt("org_robolectric_shadows_framework_java") {
   jar_path =
       "libs/org_robolectric_shadows_framework/shadows-framework-4.3.1.jar"
   output_name = "org_robolectric_shadows_framework"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -3060,36 +3129,13 @@ java_prebuilt("org_robolectric_shadows_framework_java") {
     "//third_party/sqlite4java:sqlite4java_java",
   ]
   bypass_platform_checks = true
-  skip_jetify = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("org_robolectric_utils_java") {
-  jar_path = "libs/org_robolectric_utils/utils-4.3.1.jar"
-  output_name = "org_robolectric_utils"
-  enable_bytecode_rewriter = false
-
-  # To remove visibility constraint, add this dependency to
-  # //third_party/android_deps/build.gradle.
-  visibility = [ ":*" ]
-  testonly = true
-  deps = [
-    ":com_google_auto_service_auto_service_java",
-    ":javax_annotation_javax_annotation_api_java",
-    ":javax_inject_javax_inject_java",
-    ":org_robolectric_annotations_java",
-    ":org_robolectric_pluginapi_java",
-    ":org_robolectric_utils_reflector_java",
-  ]
-  bypass_platform_checks = true
-  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_robolectric_utils_reflector_java") {
   jar_path = "libs/org_robolectric_utils_reflector/utils-reflector-4.3.1.jar"
   output_name = "org_robolectric_utils_reflector"
-  enable_bytecode_rewriter = false
+  enable_bytecode_checks = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
@@ -3101,6 +3147,5 @@ java_prebuilt("org_robolectric_utils_reflector_java") {
     ":org_ow2_asm_asm_util_java",
   ]
   bypass_platform_checks = true
-  skip_jetify = true
 }
 # === Generated Code End ===