Update build.gn to be in sync after patches.

We've been using a manually modified build.gn file because of the
androidx migration. If you just run fetch_all.py, it should generally
do nothing. When updating a library, users have to manually patch
in the differences to not override the manual changes. These are
changes that are not part of the manual modifications that haven't
been incorporated into the build.gn

It looks like the manual modifications may be in for longer than we'd
like as weblayer/public can't update and a few third_party code won't
migrate soon, so will look into making the local modifications
not need a manual patch.

Additionally, build.gradle was downloading espresso 3.2, but the DEPS
is pointing to 3.1, so sync up those numbers.

Change-Id: I3cbad618e9db2a46d06624287510963756c0d622
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2133266Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Auto-Submit: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755896}

third_party/android_deps/BUILD.gn

@@ -365,8 +365,10 @@ android_aar_prebuilt("androidx_coordinatorlayout_coordinatorlayout_java") {
     ":androidx_core_core_java",
     ":androidx_customview_customview_java",
   ]
-  ignore_proguard_configs = true
   skip_jetify = true
+
+  # https:crbug.com/954584
+  ignore_proguard_configs = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -380,11 +382,13 @@ android_aar_prebuilt("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
 
-  # Manifest and proguard config have just one entry: Adding (and -keep'ing)
+  # Manifest and proguard config have just one entry: Adding (and -keep'ing
   # android:appComponentFactory="androidx.core.app.CoreComponentFactory"
-  # Chrome doesn't use this feature and it causes a scary stack trace to be
+  # Chrome does not use this feature and it causes a scary stack trace to be
   # shown when incremental_install=true.
   ignore_manifest = true
   ignore_proguard_configs = true
@@ -415,6 +419,21 @@ android_aar_prebuilt("androidx_drawerlayout_drawerlayout_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.0.0.aar"
+  info_path = "libs/androidx_fragment_fragment/androidx_fragment_fragment.info"
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_core_core_java",
+    ":androidx_legacy_legacy_support_core_ui_java",
+    ":androidx_legacy_legacy_support_core_utils_java",
+    ":androidx_lifecycle_lifecycle_viewmodel_java",
+    ":androidx_loader_loader_java",
+  ]
+  skip_jetify = true
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_gridlayout_gridlayout_java") {
   aar_path = "libs/androidx_gridlayout_gridlayout/gridlayout-1.0.0.aar"
@@ -554,8 +573,10 @@ android_aar_prebuilt("androidx_lifecycle_lifecycle_viewmodel_java") {
   aar_path = "libs/androidx_lifecycle_lifecycle_viewmodel/lifecycle-viewmodel-2.0.0.aar"
   info_path = "libs/androidx_lifecycle_lifecycle_viewmodel/androidx_lifecycle_lifecycle_viewmodel.info"
   deps = [ ":androidx_annotation_annotation_java" ]
-  ignore_proguard_configs = true
   skip_jetify = true
+
+  # https://crbug.com/887942#c1
+  ignore_proguard_configs = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -602,8 +623,8 @@ android_aar_prebuilt("androidx_preference_preference_java") {
     ":androidx_fragment_fragment_java",
     ":androidx_recyclerview_recyclerview_java",
   ]
-  ignore_proguard_configs = true
   skip_jetify = true
+  ignore_proguard_configs = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -665,14 +686,13 @@ android_aar_prebuilt("androidx_test_ext_junit_java") {
   aar_path = "libs/androidx_test_ext_junit/junit-1.1.1.aar"
   info_path = "libs/androidx_test_ext_junit/androidx_test_ext_junit.info"
   testonly = true
-  skip_jetify = true
-
   deps = [
     ":androidx_annotation_annotation_java",
     ":androidx_test_core_java",
     ":androidx_test_monitor_java",
     "//third_party/junit:junit",
   ]
+  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -721,6 +741,30 @@ android_aar_prebuilt("androidx_test_uiautomator_uiautomator_java") {
   deps = [ ":androidx_test_runner_java" ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_vectordrawable_vectordrawable_java") {
+  aar_path =
+      "libs/androidx_vectordrawable_vectordrawable/vectordrawable-1.0.0.aar"
+  info_path = "libs/androidx_vectordrawable_vectordrawable/androidx_vectordrawable_vectordrawable.info"
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_core_core_java",
+  ]
+  skip_jetify = true
+  create_srcjar = false
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_vectordrawable_vectordrawable_animated_java") {
+  aar_path = "libs/androidx_vectordrawable_vectordrawable_animated/vectordrawable-animated-1.0.0.aar"
+  info_path = "libs/androidx_vectordrawable_vectordrawable_animated/androidx_vectordrawable_vectordrawable_animated.info"
+  deps = [
+    ":androidx_legacy_legacy_support_core_ui_java",
+    ":androidx_vectordrawable_vectordrawable_java",
+  ]
+  skip_jetify = true
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_viewpager_viewpager_java") {
   aar_path = "libs/androidx_viewpager_viewpager/viewpager-1.0.0.aar"
@@ -1094,6 +1138,8 @@ android_aar_prebuilt("google_play_services_auth_java") {
   aar_path = "libs/com_google_android_gms_play_services_auth/play-services-auth-17.0.0.aar"
   info_path = "libs/com_google_android_gms_play_services_auth/com_google_android_gms_play_services_auth.info"
   deps = [
+    ":androidx_fragment_fragment_java",
+    ":androidx_loader_loader_java",
     ":google_play_services_auth_api_phone_java",
     ":google_play_services_auth_base_java",
     ":google_play_services_base_java",
@@ -1124,6 +1170,7 @@ android_aar_prebuilt("google_play_services_auth_base_java") {
   aar_path = "libs/com_google_android_gms_play_services_auth_base/play-services-auth-base-17.0.0.aar"
   info_path = "libs/com_google_android_gms_play_services_auth_base/com_google_android_gms_play_services_auth_base.info"
   deps = [
+    ":androidx_collection_collection_java",
     ":google_play_services_base_java",
     ":google_play_services_basement_java",
     ":google_play_services_tasks_java",
@@ -1138,6 +1185,9 @@ android_aar_prebuilt("google_play_services_base_java") {
   aar_path = "libs/com_google_android_gms_play_services_base/play-services-base-17.0.0.aar"
   info_path = "libs/com_google_android_gms_play_services_base/com_google_android_gms_play_services_base.info"
   deps = [
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
+    ":androidx_fragment_fragment_java",
     ":google_play_services_basement_java",
     ":google_play_services_tasks_java",
   ]
@@ -1150,7 +1200,11 @@ android_aar_prebuilt("google_play_services_base_java") {
 android_aar_prebuilt("google_play_services_basement_java") {
   aar_path = "libs/com_google_android_gms_play_services_basement/play-services-basement-17.0.0.aar"
   info_path = "libs/com_google_android_gms_play_services_basement/com_google_android_gms_play_services_basement.info"
-  deps = [ ":com_android_support_support_v4_java" ]
+  deps = [
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
+    ":androidx_fragment_fragment_java",
+  ]
 
   # Removing drawables from GMS .aars as they are unused bloat.
   strip_drawables = true
@@ -1162,7 +1216,8 @@ android_aar_prebuilt("google_play_services_cast_java") {
   aar_path = "libs/com_google_android_gms_play_services_cast/play-services-cast-17.0.0.aar"
   info_path = "libs/com_google_android_gms_play_services_cast/com_google_android_gms_play_services_cast.info"
   deps = [
-    ":com_android_support_mediarouter_v7_java",
+    ":androidx_core_core_java",
+    ":androidx_mediarouter_mediarouter_java",
     ":google_play_services_base_java",
     ":google_play_services_basement_java",
     ":google_play_services_flags_java",
@@ -1178,8 +1233,13 @@ android_aar_prebuilt("google_play_services_cast_framework_java") {
   aar_path = "libs/com_google_android_gms_play_services_cast_framework/play-services-cast-framework-17.0.0.aar"
   info_path = "libs/com_google_android_gms_play_services_cast_framework/com_google_android_gms_play_services_cast_framework.info"
   deps = [
-    ":com_android_support_mediarouter_v7_java",
-    ":com_android_support_recyclerview_v7_java",
+    ":androidx_appcompat_appcompat_java",
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
+    ":androidx_fragment_fragment_java",
+    ":androidx_media_media_java",
+    ":androidx_mediarouter_mediarouter_java",
+    ":androidx_recyclerview_recyclerview_java",
     ":google_play_services_base_java",
     ":google_play_services_basement_java",
     ":google_play_services_cast_java",
@@ -1209,6 +1269,9 @@ android_aar_prebuilt("google_play_services_gcm_java") {
   aar_path = "libs/com_google_android_gms_play_services_gcm/play-services-gcm-17.0.0.aar"
   info_path = "libs/com_google_android_gms_play_services_gcm/com_google_android_gms_play_services_gcm.info"
   deps = [
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
+    ":androidx_legacy_legacy_support_core_utils_java",
     ":google_play_services_base_java",
     ":google_play_services_basement_java",
     ":google_play_services_iid_java",
@@ -1224,6 +1287,8 @@ android_aar_prebuilt("google_play_services_iid_java") {
   aar_path = "libs/com_google_android_gms_play_services_iid/play-services-iid-17.0.0.aar"
   info_path = "libs/com_google_android_gms_play_services_iid/com_google_android_gms_play_services_iid.info"
   deps = [
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
     ":google_play_services_base_java",
     ":google_play_services_basement_java",
     ":google_play_services_stats_java",
@@ -1296,6 +1361,7 @@ android_aar_prebuilt("google_play_services_vision_common_java") {
     ":google_play_services_basement_java",
     ":google_play_services_clearcut_java",
     ":google_play_services_flags_java",
+    ":google_play_services_phenotype_java",
   ]
 
   # Removing drawables from GMS .aars as they are unused bloat.
@@ -1317,6 +1383,8 @@ android_aar_prebuilt("com_google_android_material_material_java") {
     ":androidx_recyclerview_recyclerview_java",
     ":androidx_transition_transition_java",
   ]
+
+  # Reduce binary size. https:crbug.com/954584
   ignore_proguard_configs = true
 }
 
@@ -1340,6 +1408,16 @@ java_prebuilt("com_google_auto_service_auto_service_annotations_java") {
   enable_bytecode_rewriter = false
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("com_google_code_findbugs_jsr305_java") {
+  jar_path = "libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar"
+  output_name = "com_google_code_findbugs_jsr305"
+  supports_android = true
+
+  # Needed to break dependency cycle for errorprone_plugin_java.
+  no_build_hooks = true
+}
+
 # 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"
@@ -1414,6 +1492,9 @@ java_prebuilt("com_google_guava_guava_java") {
     ":org_checkerframework_checker_qual_java",
     ":org_codehaus_mojo_animal_sniffer_annotations_java",
   ]
+
+  # Need to exclude class and replace it with class library as
+  # com_google_guava_listenablefuture has support_androids=true.
   deps += [ ":com_google_guava_listenablefuture_java" ]
   jar_excluded_patterns = [ "*/ListenableFuture.class" ]
 }
@@ -1423,6 +1504,8 @@ java_prebuilt("com_google_guava_listenablefuture_java") {
   jar_path = "libs/com_google_guava_listenablefuture/listenablefuture-1.0.jar"
   output_name = "com_google_guava_listenablefuture"
   supports_android = true
+
+  # Needed to break dependency cycle for errorprone_plugin_java.
   no_build_hooks = true
 }
 
@@ -1430,7 +1513,6 @@ java_prebuilt("com_google_guava_listenablefuture_java") {
 java_prebuilt("com_google_protobuf_protobuf_javalite_java") {
   jar_path =
       "libs/com_google_protobuf_protobuf_javalite/protobuf-javalite-3.11.4.jar"
-
   output_name = "com_google_protobuf_protobuf_javalite"
   supports_android = true
 }
@@ -1440,6 +1522,8 @@ java_prebuilt("com_googlecode_java_diff_utils_diffutils_java") {
   jar_path = "libs/com_googlecode_java_diff_utils_diffutils/diffutils-1.3.0.jar"
   output_name = "com_googlecode_java_diff_utils_diffutils"
   supports_android = true
+
+  # Needed to break dependency cycle for errorprone_plugin_java.
   no_build_hooks = true
 }
 
@@ -1629,22 +1713,6 @@ android_aar_prebuilt("androidx_documentfile_documentfile_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.0.0.aar"
-  info_path = "libs/androidx_fragment_fragment/androidx_fragment_fragment.info"
-
-  deps = [
-    ":androidx_annotation_annotation_java",
-    ":androidx_core_core_java",
-    ":androidx_legacy_legacy_support_core_ui_java",
-    ":androidx_legacy_legacy_support_core_utils_java",
-    ":androidx_lifecycle_lifecycle_viewmodel_java",
-    ":androidx_loader_loader_java",
-  ]
-  skip_jetify = true
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_leanback_leanback_java") {
   aar_path = "libs/androidx_leanback_leanback/leanback-1.0.0.aar"
@@ -1739,6 +1807,8 @@ android_aar_prebuilt("androidx_media_media_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
 }
 
@@ -1791,7 +1861,7 @@ android_aar_prebuilt("androidx_test_espresso_espresso_idling_resource_java") {
   info_path = "libs/androidx_test_espresso_espresso_idling_resource/androidx_test_espresso_espresso_idling_resource.info"
 
   # To remove visibility constraint, add this dependency to
-  # //tools/android/roll/android_deps/build.gradle.
+  # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   testonly = true
   skip_jetify = true
@@ -1814,32 +1884,6 @@ android_aar_prebuilt("androidx_transition_transition_java") {
   deps += [ ":androidx_fragment_fragment_java" ]
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("androidx_vectordrawable_vectordrawable_java") {
-  aar_path =
-      "libs/androidx_vectordrawable_vectordrawable/vectordrawable-1.0.0.aar"
-  info_path = "libs/androidx_vectordrawable_vectordrawable/androidx_vectordrawable_vectordrawable.info"
-
-  deps = [
-    ":androidx_annotation_annotation_java",
-    ":androidx_core_core_java",
-  ]
-  skip_jetify = true
-  create_srcjar = false
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("androidx_vectordrawable_vectordrawable_animated_java") {
-  aar_path = "libs/androidx_vectordrawable_vectordrawable_animated/vectordrawable-animated-1.0.0.aar"
-  info_path = "libs/androidx_vectordrawable_vectordrawable_animated/androidx_vectordrawable_vectordrawable_animated.info"
-
-  deps = [
-    ":androidx_legacy_legacy_support_core_ui_java",
-    ":androidx_vectordrawable_vectordrawable_java",
-  ]
-  skip_jetify = true
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_versionedparcelable_versionedparcelable_java") {
   aar_path = "libs/androidx_versionedparcelable_versionedparcelable/versionedparcelable-1.0.0.aar"
@@ -1954,9 +1998,9 @@ android_aar_prebuilt("com_android_support_preference_v14_java") {
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
-  skip_jetify = true
   deps = [ ":com_android_support_preference_v7_java" ]
   jar_excluded_patterns = [ "androidx/preference/R*" ]
+  skip_jetify = true
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -2109,6 +2153,7 @@ android_aar_prebuilt("google_play_services_clearcut_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [
+    ":androidx_core_core_java",
     ":google_play_services_base_java",
     ":google_play_services_basement_java",
     ":google_play_services_phenotype_java",
@@ -2145,6 +2190,7 @@ android_aar_prebuilt("google_play_services_phenotype_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [
+    ":androidx_core_core_java",
     ":google_play_services_base_java",
     ":google_play_services_basement_java",
     ":google_play_services_tasks_java",
@@ -2176,7 +2222,10 @@ android_aar_prebuilt("google_play_services_stats_java") {
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
-  deps = [ ":google_play_services_basement_java" ]
+  deps = [
+    ":androidx_legacy_legacy_support_core_utils_java",
+    ":google_play_services_basement_java",
+  ]
 
   # Removing drawables from GMS .aars as they are unused bloat.
   strip_drawables = true
@@ -2206,14 +2255,6 @@ java_prebuilt("com_google_code_findbugs_jFormatString_java") {
   visibility = [ ":*" ]
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("com_google_code_findbugs_jsr305_java") {
-  jar_path = "libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar"
-  output_name = "com_google_code_findbugs_jsr305"
-  supports_android = true
-  no_build_hooks = true
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_dagger_dagger_producers_java") {
   jar_path = "libs/com_google_dagger_dagger_producers/dagger-producers-2.26.jar"
@@ -2379,13 +2420,14 @@ java_prebuilt("com_google_protobuf_protobuf_java_java") {
   visibility = [ ":*" ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_squareup_javawriter_java") {
   jar_path = "libs/com_squareup_javawriter/javawriter-2.1.1.jar"
   output_name = "com_squareup_javawriter"
   supports_android = true
 
   # To remove visibility constraint, add this dependency to
-  # //tools/android/roll/android_deps/build.gradle.
+  # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   testonly = true
 }

third_party/android_deps/build.gradle

@@ -154,7 +154,7 @@ dependencies {
     testCompile "androidx.test:monitor:1.2.0"
     testCompile "androidx.test:rules:1.2.0"
     testCompile "androidx.test:runner:1.2.0"
-    testCompile "androidx.test.espresso:espresso-core:3.2.0"
+    testCompile "androidx.test.espresso:espresso-core:3.1.0"
     testCompile "androidx.test.ext:junit:1.1.1"
     testCompile "androidx.test.uiautomator:uiautomator:2.2.0"
     testCompile "com.googlecode.java-diff-utils:diffutils:1.3.0"