Android: Update errorprone from 2.4.0 -> 2.7.1

Temporarily ignore all new errors as they can be fixed in follow-up CLs. Downstream needs to know that the upstream annotations are updated in order to add the right jar_excluded_patterns. This will be removed in a follow-up CL. Bug: 1216032, 1205664 Fixed: 1216032 Change-Id: I5e5f373034aa5efdd1fd59f3d4eb612b2ba1bf95 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2951091 Reviewed-by: Yaron Friedman <yfriedman@chromium.org> Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org> Commit-Queue: Peter Wen <wnwen@chromium.org> Auto-Submit: Peter Wen <wnwen@chromium.org> Cr-Commit-Position: refs/heads/master@{#892063}
chromium · Jun 14, 2021 · 840bd64 · 840bd64
1 parent 1427ea8
commit 840bd64
Show file tree

Hide file tree

Showing 29 changed files with 406 additions and 128 deletions.
diff --git a/DEPS b/DEPS
@@ -2224,7 +2224,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine',
-              'version': 'version:2@2.8.0.cr0',
+              'version': 'version:2@2.8.8.cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2620,7 +2620,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation',
-              'version': 'version:2@2.4.0.cr0',
+              'version': 'version:2@2.7.1.cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2631,7 +2631,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations',
-              'version': 'version:2@2.4.0.cr0',
+              'version': 'version:2@2.7.1.cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2642,7 +2642,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api',
-              'version': 'version:2@2.4.0.cr0',
+              'version': 'version:2@2.7.1.cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2653,7 +2653,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core',
-              'version': 'version:2@2.4.0.cr0',
+              'version': 'version:2@2.7.1.cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2664,7 +2664,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations',
-              'version': 'version:2@2.4.0.cr0',
+              'version': 'version:2@2.7.1.cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2935,6 +2935,17 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/io_github_java_diff_utils_java_diff_utils',
+              'version': 'version:2@4.0.cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   'src/third_party/android_deps/libs/javax_annotation_javax_annotation_api': {
       'packages': [
           {
@@ -3214,7 +3225,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual',
-              'version': 'version:2@3.5.0.cr0',
+              'version': 'version:2@3.8.0.cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3225,7 +3236,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_shaded',
-              'version': 'version:2@3.1.2.cr0',
+              'version': 'version:2@3.11.0.cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3276,6 +3287,17 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/org_eclipse_jgit_org_eclipse_jgit',
+              'version': 'version:2@4.4.1.201607150455-r.cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   'src/third_party/android_deps/libs/org_jetbrains_annotations': {
       'packages': [
           {
@@ -3540,17 +3562,6 @@ deps = {
       'dep_type': 'cipd',
   },
 
-  'src/third_party/android_deps/libs/org_threeten_threeten_extra': {
-      'packages': [
-          {
-              'package': 'chromium/third_party/android_deps/libs/org_threeten_threeten_extra',
-              'version': 'version:2@1.5.0.cr0',
-          },
-      ],
-      'condition': 'checkout_android',
-      'dep_type': 'cipd',
-  },
-
   # === ANDROID_DEPS Generated Code End ===
 
   'src/tools/resultdb': {

diff --git a/build/android/gyp/compile_java.py b/build/android/gyp/compile_java.py
@@ -44,6 +44,18 @@
     'UnescapedEntity',
     'NonCanonicalType',
     'AlmostJavadoc',
+    # The following are added for errorprone update: https://crbug.com/1216032
+    'InlineMeSuggester',
+    'DoNotClaimAnnotations',
+    'JavaUtilDate',
+    'IdentityHashMapUsage',
+    'UnnecessaryMethodReference',
+    'LongFloatConversion',
+    'CharacterGetNumericValue',
+    'ErroneousThreadPoolConstructorChecker',
+    'StaticMockMember',
+    'MissingSuperCall',
+    'ToStringReturnsNull',
     # TODO(crbug.com/834807): Follow steps in bug
     'DoubleBraceInitialization',
     # TODO(crbug.com/834790): Follow steps in bug.
@@ -176,7 +188,6 @@
     'InvalidThrows',
     'LongLiteralLowerCaseSuffix',
     'MultiVariableDeclaration',
-    'ParameterNotNullable',
     'RedundantOverride',
     'StaticQualifiedUsingExpression',
     'StringEquality',
@@ -209,6 +220,8 @@ def Elaborate(line):
           line, prefix, 'docs/ui/android/bytecode_rewriting.md')
     return line
 
+  output = build_utils.FilterReflectiveAccessJavaWarnings(output)
+
   lines = (l for l in output.split('\n') if ApplyFilters(l))
   lines = (Elaborate(l) for l in lines)
 

diff --git a/build/config/android/config.gni b/build/config/android/config.gni
@@ -350,4 +350,7 @@ if (is_android || is_chromeos) {
       "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
 
   android_sdk_tools_bundle_aapt2 = "${android_sdk_tools_bundle_aapt2_dir}/aapt2"
+
+  # Temporary fix for https://crbug.com/1205664
+  use_upstream_errorprone_annotations_inlineme = true
 }
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
@@ -235,15 +235,15 @@ java_prebuilt("com_google_dagger_dagger_compiler_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_errorprone_error_prone_annotation_java") {
-  jar_path = "libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.4.0.jar"
+  jar_path = "libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.7.1.jar"
   output_name = "com_google_errorprone_error_prone_annotation"
   enable_bytecode_checks = false
   deps = [ ":com_google_guava_guava_java" ]
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_errorprone_error_prone_annotations_java") {
-  jar_path = "libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.4.0.jar"
+  jar_path = "libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.7.1.jar"
   output_name = "com_google_errorprone_error_prone_annotations"
   supports_android = true
 
@@ -253,7 +253,7 @@ java_prebuilt("com_google_errorprone_error_prone_annotations_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 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.4.0.jar"
+  jar_path = "libs/com_google_errorprone_error_prone_check_api/error_prone_check_api-2.7.1.jar"
   output_name = "com_google_errorprone_error_prone_check_api"
   enable_bytecode_checks = false
   deps = [
@@ -264,15 +264,15 @@ java_prebuilt("com_google_errorprone_error_prone_check_api_java") {
     ":com_google_errorprone_error_prone_annotation_java",
     ":com_google_errorprone_error_prone_annotations_java",
     ":com_google_errorprone_javac_java",
-    ":com_googlecode_java_diff_utils_diffutils_java",
+    ":io_github_java_diff_utils_java_diff_utils_java",
     ":org_checkerframework_dataflow_shaded_java",
   ]
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("com_google_errorprone_error_prone_core_java") {
   jar_path =
-      "libs/com_google_errorprone_error_prone_core/error_prone_core-2.4.0.jar"
+      "libs/com_google_errorprone_error_prone_core/error_prone_core-2.7.1.jar"
   output_name = "com_google_errorprone_error_prone_core"
   enable_bytecode_checks = false
   deps = [
@@ -290,7 +290,6 @@ java_prebuilt("com_google_errorprone_error_prone_core_java") {
     ":com_google_protobuf_protobuf_java_java",
     ":org_checkerframework_dataflow_shaded_java",
     ":org_pcollections_pcollections_java",
-    ":org_threeten_threeten_extra_java",
   ]
 }
 
@@ -352,16 +351,6 @@ java_prebuilt("com_google_j2objc_j2objc_annotations_java") {
   enable_bytecode_checks = false
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-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.
-  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.13.0.jar"
@@ -442,7 +431,7 @@ java_prebuilt("org_ow2_asm_asm_util_java") {
 
 # 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.8.0.jar"
+  jar_path = "libs/com_github_ben_manes_caffeine_caffeine/caffeine-2.8.8.jar"
   output_name = "com_github_ben_manes_caffeine_caffeine"
   enable_bytecode_checks = false
 
@@ -562,7 +551,7 @@ java_prebuilt("com_google_dagger_dagger_spi_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 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.4.0.jar"
+  jar_path = "libs/com_google_errorprone_error_prone_type_annotations/error_prone_type_annotations-2.7.1.jar"
   output_name = "com_google_errorprone_error_prone_type_annotations"
   enable_bytecode_checks = false
 
@@ -621,6 +610,22 @@ java_prebuilt("com_google_protobuf_protobuf_java_java") {
   ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("io_github_java_diff_utils_java_diff_utils_java") {
+  jar_path =
+      "libs/io_github_java_diff_utils_java_diff_utils/java-diff-utils-4.0.jar"
+  output_name = "io_github_java_diff_utils_java_diff_utils"
+  enable_bytecode_checks = false
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [
+    ":*",
+    "//third_party/androidx:*",
+  ]
+  deps = [ ":org_eclipse_jgit_org_eclipse_jgit_java" ]
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("net_ltgt_gradle_incap_incap_java") {
   jar_path = "libs/net_ltgt_gradle_incap_incap/incap-0.2.jar"
@@ -637,7 +642,7 @@ java_prebuilt("net_ltgt_gradle_incap_incap_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_checkerframework_checker_qual_java") {
-  jar_path = "libs/org_checkerframework_checker_qual/checker-qual-3.5.0.jar"
+  jar_path = "libs/org_checkerframework_checker_qual/checker-qual-3.8.0.jar"
   output_name = "org_checkerframework_checker_qual"
   enable_bytecode_checks = false
 
@@ -652,7 +657,7 @@ java_prebuilt("org_checkerframework_checker_qual_java") {
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_checkerframework_dataflow_shaded_java") {
   jar_path =
-      "libs/org_checkerframework_dataflow_shaded/dataflow-shaded-3.1.2.jar"
+      "libs/org_checkerframework_dataflow_shaded/dataflow-shaded-3.11.0.jar"
   output_name = "org_checkerframework_dataflow_shaded"
   enable_bytecode_checks = false
 
@@ -664,6 +669,20 @@ java_prebuilt("org_checkerframework_dataflow_shaded_java") {
   ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("org_eclipse_jgit_org_eclipse_jgit_java") {
+  jar_path = "libs/org_eclipse_jgit_org_eclipse_jgit/org.eclipse.jgit-4.4.1.201607150455-r.jar"
+  output_name = "org_eclipse_jgit_org_eclipse_jgit"
+  enable_bytecode_checks = false
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [
+    ":*",
+    "//third_party/androidx:*",
+  ]
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_jetbrains_annotations_java") {
   jar_path = "libs/org_jetbrains_annotations/annotations-13.0.jar"
@@ -736,20 +755,6 @@ java_prebuilt("org_pcollections_pcollections_java") {
   ]
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("org_threeten_threeten_extra_java") {
-  jar_path = "libs/org_threeten_threeten_extra/threeten-extra-1.5.0.jar"
-  output_name = "org_threeten_threeten_extra"
-  enable_bytecode_checks = false
-
-  # To remove visibility constraint, add this dependency to
-  # //third_party/android_deps/build.gradle.
-  visibility = [
-    ":*",
-    "//third_party/androidx:*",
-  ]
-}
-
 if (!limit_android_deps) {
   # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
   java_prebuilt("android_arch_lifecycle_common_java") {
@@ -1367,6 +1372,18 @@ if (!limit_android_deps) {
     ]
   }
 
+  # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+  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
+    testonly = 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("javax_annotation_javax_annotation_api_java") {
     jar_path = "libs/javax_annotation_javax_annotation_api/javax.annotation-api-1.3.2.jar"

diff --git a/third_party/android_deps/additional_readme_paths.json b/third_party/android_deps/additional_readme_paths.json
@@ -109,6 +109,7 @@
     "libs/com_googlecode_java_diff_utils_diffutils",
     "libs/com_squareup_javapoet",
     "libs/com_squareup_javawriter",
+    "libs/io_github_java_diff_utils_java_diff_utils",
     "libs/javax_annotation_javax_annotation_api",
     "libs/javax_annotation_jsr250_api",
     "libs/javax_inject_javax_inject",
@@ -140,6 +141,7 @@
     "libs/org_codehaus_plexus_plexus_container_default",
     "libs/org_codehaus_plexus_plexus_interpolation",
     "libs/org_codehaus_plexus_plexus_utils",
+    "libs/org_eclipse_jgit_org_eclipse_jgit",
     "libs/org_jetbrains_annotations",
     "libs/org_jetbrains_kotlin_kotlin_stdlib",
     "libs/org_jetbrains_kotlin_kotlin_stdlib_common",
@@ -163,6 +165,5 @@
     "libs/org_robolectric_shadows_framework",
     "libs/org_robolectric_shadows_playservices",
     "libs/org_robolectric_utils",
-    "libs/org_robolectric_utils_reflector",
-    "libs/org_threeten_threeten_extra"
+    "libs/org_robolectric_utils_reflector"
 ]
diff --git a/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine/README.chromium b/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine/README.chromium
@@ -1,13 +1,13 @@
 Name: Caffeine cache
 Short Name: caffeine
 URL: https://github.com/ben-manes/caffeine
-Version: 2.8.0
+Version: 2.8.8
 License: Apache License, Version 2.0
 License File: NOT_SHIPPED
 Security Critical: no
 
 Description:
-A high performance caching library for Java 8+
+A high performance caching library
 
 Local Modifications:
 No modifications.