Android: Update error prone to v2.3.4

This a simple upgrade of an existing public Google library
(http://errorprone.info/) from version 2.3.3 to version 2.3.4.

It pulls in error prone's new maven dependencies and removes the ones
that error prone has removed.

Also fixes some of the new issues that were exposed by the new checks.

Bug: 1030676
Change-Id: I2f76601befe4575bb19588a1c701c0bb73170c84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1953863Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Max Moroz <mmoroz@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734523}

DEPS

@@ -2688,22 +2688,22 @@ deps = {
       'dep_type': 'cipd',
   },
 
-  'src/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms': {
+  'src/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine': {
       'packages': [
           {
-              'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms',
-              'version': 'version:1.0-cr0',
+              'package': 'chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine',
+              'version': 'version:2.7.0-cr0',
           },
       ],
       'condition': 'checkout_android',
       'dep_type': 'cipd',
   },
 
-  'src/third_party/android_deps/libs/com_github_stephenc_jcip_jcip_annotations': {
+  'src/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms': {
       'packages': [
           {
-              'package': 'chromium/third_party/android_deps/libs/com_github_stephenc_jcip_jcip_annotations',
-              'version': 'version:1.0-1-cr0',
+              'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms',
+              'version': 'version:1.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3044,7 +3044,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation',
-              'version': 'version:2.3.3-cr0',
+              'version': 'version:2.3.4-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3055,7 +3055,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations',
-              'version': 'version:2.3.3-cr0',
+              'version': 'version:2.3.4-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3066,7 +3066,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api',
-              'version': 'version:2.3.3-cr0',
+              'version': 'version:2.3.4-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3077,7 +3077,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core',
-              'version': 'version:2.3.3-cr0',
+              'version': 'version:2.3.4-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3088,7 +3088,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations',
-              'version': 'version:2.3.3-cr0',
+              'version': 'version:2.3.4-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3286,7 +3286,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual',
-              'version': 'version:2.5.3-cr0',
+              'version': 'version:3.0.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3297,7 +3297,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow',
-              'version': 'version:2.5.3-cr0',
+              'version': 'version:3.0.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3308,7 +3308,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_checkerframework_javacutil',
-              'version': 'version:2.5.3-cr0',
+              'version': 'version:3.0.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3370,6 +3370,39 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/org_plumelib_plume_util': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/org_plumelib_plume_util',
+              'version': 'version:1.0.6-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/org_plumelib_reflection_util': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/org_plumelib_reflection_util',
+              'version': 'version:0.0.2-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/org_plumelib_require_javadoc': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/org_plumelib_require_javadoc',
+              'version': 'version:0.1.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   # === ANDROID_DEPS Generated Code End ===
 }
 

base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java

@@ -48,6 +48,7 @@ public class SequencedTaskRunnerImpl extends TaskRunnerImpl implements Sequenced
     }
 
     @Override
+    @SuppressWarnings("GuardedBy") // The GuardedBy check doesn't understand super.mLock == mLock.
     public void postDelayedTaskToNative(Runnable runnable, long delay) {
         synchronized (mLock) {
             if (mNumUnfinishedNativeTasks++ == 0) {

build/android/gyp/compile_java.py

@@ -41,6 +41,8 @@ ERRORPRONE_WARNINGS_TO_TURN_OFF = [
     'JUnitAmbiguousTestClass',
     # TODO(crbug.com/1027683): Follow steps in bug.
     'UnnecessaryParentheses',
+    # TODO(wnwen): Fix issue in JavaUploadDataSinkBase.java
+    'PrimitiveAtomicReference',
     # Android platform default is always UTF-8.
     # https://developer.android.com/reference/java/nio/charset/Charset.html#defaultCharset()
     'DefaultCharset',
@@ -119,6 +121,14 @@ ERRORPRONE_WARNINGS_TO_TURN_OFF = [
     'FunctionalInterfaceClash',
     # Nice to have.
     'InconsistentOverloads',
+    # Dagger generated code triggers this.
+    'SameNameButDifferent',
+    # Nice to have.
+    'UnnecessaryLambda',
+    # Nice to have.
+    'UnnecessaryAnonymousClass',
+    # Nice to have.
+    'LiteProtoToString',
 ]
 
 # Full list of checks: https://errorprone.info/bugpatterns

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java

@@ -33,7 +33,7 @@ import java.util.concurrent.TimeoutException;
 @VisibleForTesting
 class ContextualSearchFakeServer
         implements ContextualSearchNetworkCommunicator, OverlayPanelContentFactory {
-    static final long LOGGED_EVENT_ID = 2 ^ 50; // Arbitrary value larger than 32 bits.
+    static final long LOGGED_EVENT_ID = 1L << 50; // Arbitrary value larger than 32 bits.
 
     private final ContextualSearchPolicy mPolicy;
 

components/offline_items_collection/core/android/java/src/org/chromium/components/offline_items_collection/OfflineItem.java

@@ -4,6 +4,8 @@
 
 package org.chromium.components.offline_items_collection;
 
+import java.util.Objects;
+
 /**
  * This class is the Java counterpart to the C++ OfflineItem
  * (components/offline_items_collection/core/offline_item.h) class.
@@ -45,12 +47,10 @@ public class OfflineItem implements Cloneable {
         }
 
         @Override
-        @SuppressWarnings("ReferenceEquality")
         public boolean equals(Object obj) {
             if (obj instanceof Progress) {
                 Progress other = (Progress) obj;
-                return value == other.value && unit == other.unit
-                        && (max == other.max || (max != null && max.equals(other.max)));
+                return value == other.value && unit == other.unit && Objects.equals(max, other.max);
             }
             return false;
         }

third_party/android_deps/BUILD.gn

@@ -1065,11 +1065,10 @@ 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_core_java") {
   jar_path =
-      "libs/com_google_errorprone_error_prone_core/error_prone_core-2.3.3.jar"
+      "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
   deps = [
-    ":com_github_stephenc_jcip_jcip_annotations_java",
     ":com_google_auto_auto_common_java",
     ":com_google_code_findbugs_jFormatString_java",
     ":com_google_code_findbugs_jsr305_java",
@@ -1675,20 +1674,24 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_core_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-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"
+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
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
+  deps = [
+    ":com_google_errorprone_error_prone_annotations_java",
+    ":org_checkerframework_checker_qual_java",
+  ]
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("com_github_stephenc_jcip_jcip_annotations_java") {
-  jar_path = "libs/com_github_stephenc_jcip_jcip_annotations/jcip-annotations-1.0-1.jar"
-  output_name = "com_github_stephenc_jcip_jcip_annotations"
+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
 
   # To remove visibility constraint, add this dependency to
@@ -1849,7 +1852,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_annotation_java") {
-  jar_path = "libs/com_google_errorprone_error_prone_annotation/error_prone_annotation-2.3.3.jar"
+  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
 
@@ -1861,7 +1864,7 @@ java_prebuilt("com_google_errorprone_error_prone_annotation_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.3.3.jar"
+  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
 
@@ -1872,7 +1875,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.3.3.jar"
+  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
 
@@ -1880,6 +1883,7 @@ java_prebuilt("com_google_errorprone_error_prone_check_api_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   deps = [
+    ":com_github_ben_manes_caffeine_caffeine_java",
     ":com_github_kevinstern_software_and_algorithms_java",
     ":com_google_code_findbugs_jsr305_java",
     ":com_google_errorprone_error_prone_annotation_java",
@@ -1892,7 +1896,7 @@ java_prebuilt("com_google_errorprone_error_prone_check_api_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.3.3.jar"
+  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
 
@@ -2001,7 +2005,7 @@ java_prebuilt("org_checkerframework_checker_compat_qual_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-2.5.3.jar"
+  jar_path = "libs/org_checkerframework_checker_qual/checker-qual-3.0.0.jar"
   output_name = "org_checkerframework_checker_qual"
   enable_bytecode_rewriter = false
 
@@ -2012,7 +2016,7 @@ java_prebuilt("org_checkerframework_checker_qual_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_checkerframework_dataflow_java") {
-  jar_path = "libs/org_checkerframework_dataflow/dataflow-2.5.3.jar"
+  jar_path = "libs/org_checkerframework_dataflow/dataflow-3.0.0.jar"
   output_name = "org_checkerframework_dataflow"
   enable_bytecode_rewriter = false
 
@@ -2027,14 +2031,17 @@ java_prebuilt("org_checkerframework_dataflow_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_checkerframework_javacutil_java") {
-  jar_path = "libs/org_checkerframework_javacutil/javacutil-2.5.3.jar"
+  jar_path = "libs/org_checkerframework_javacutil/javacutil-3.0.0.jar"
   output_name = "org_checkerframework_javacutil"
   enable_bytecode_rewriter = false
 
   # To remove visibility constraint, add this dependency to
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
-  deps = [ ":org_checkerframework_checker_qual_java" ]
+  deps = [
+    ":org_checkerframework_checker_qual_java",
+    ":org_plumelib_plume_util_java",
+  ]
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -2095,4 +2102,42 @@ java_prebuilt("org_pcollections_pcollections_java") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
 }
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+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
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [ ":*" ]
+  deps = [
+    ":org_plumelib_reflection_util_java",
+    ":org_plumelib_require_javadoc_java",
+  ]
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+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
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [ ":*" ]
+  deps = [ ":org_plumelib_require_javadoc_java" ]
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+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
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [ ":*" ]
+}
 # === Generated Code End ===

third_party/android_deps/additional_readme_paths.json

@@ -99,8 +99,8 @@
     "libs/com_android_support_viewpager",
     "libs/com_android_tools_build_jetifier_jetifier_core",
     "libs/com_android_tools_build_jetifier_jetifier_processor",
+    "libs/com_github_ben_manes_caffeine_caffeine",
     "libs/com_github_kevinstern_software_and_algorithms",
-    "libs/com_github_stephenc_jcip_jcip_annotations",
     "libs/com_google_android_gms_play_services_auth",
     "libs/com_google_android_gms_play_services_auth_api_phone",
     "libs/com_google_android_gms_play_services_auth_base",
@@ -160,5 +160,8 @@
     "libs/org_jdom_jdom2",
     "libs/org_jetbrains_kotlin_kotlin_stdlib",
     "libs/org_jetbrains_kotlin_kotlin_stdlib_common",
-    "libs/org_pcollections_pcollections"
+    "libs/org_pcollections_pcollections",
+    "libs/org_plumelib_plume_util",
+    "libs/org_plumelib_reflection_util",
+    "libs/org_plumelib_require_javadoc"
 ]

third_party/android_deps/build.gradle

@@ -135,7 +135,7 @@ dependencies {
     buildCompile "com.google.auto.service:auto-service-annotations:1.0-rc6"
     buildCompile "com.google.auto.service:auto-service:1.0-rc6"
 
-    buildCompile "com.google.errorprone:error_prone_core:2.3.3"
+    buildCompile "com.google.errorprone:error_prone_core:2.3.4"
 
     // Jetify to androidx.
     buildCompile "com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta08"

third_party/android_deps/buildSrc/src/main/groovy/ChromiumDepGraph.groovy

@@ -39,6 +39,9 @@ class ChromiumDepGraph {
             licenseName: "Apache 2.0"),
         'com_google_code_findbugs_jFormatString': new PropertyOverride(
             licenseUrl: "https://raw.githubusercontent.com/spotbugs/spotbugs/master/spotbugs/licenses/LICENSE.txt"),
+        'com_google_errorprone_error_prone_annotation': new PropertyOverride(
+            url: "https://errorprone.info/",
+            licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt"),
         'com_google_errorprone_error_prone_annotations': new PropertyOverride(
             url: "https://errorprone.info/",
             licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
@@ -102,7 +105,13 @@ class ChromiumDepGraph {
             licenseUrl: "https://raw.githubusercontent.com/typetools/checker-framework/master/LICENSE.txt",
             licenseName: "GPL v2 with the classpath exception"),
         'org_pcollections_pcollections': new PropertyOverride(
-            licenseUrl: "https://raw.githubusercontent.com/hrldcpr/pcollections/master/LICENSE")
+            licenseUrl: "https://raw.githubusercontent.com/hrldcpr/pcollections/master/LICENSE"),
+        'org_plumelib_plume_util': new PropertyOverride(
+            licenseUrl: "https://raw.githubusercontent.com/plume-lib/plume-util/master/LICENSE"),
+        'org_plumelib_require_javadoc': new PropertyOverride(
+            licenseUrl: "https://raw.githubusercontent.com/plume-lib/require-javadoc/master/LICENSE"),
+        'org_plumelib_reflection_util': new PropertyOverride(
+            licenseUrl: "https://raw.githubusercontent.com/plume-lib/reflection-util/master/LICENSE"),
     ]
 
     Project project

third_party/android_deps/libs/androidx_multidex_multidex/README.chromium

@@ -7,8 +7,7 @@ License File: LICENSE
 Security Critical: yes
 
 Description:
-Library for legacy multi-dex support.
-https://developer.android.com/jetpack/androidx/releases/multidex
+Library for legacy multi-dex support
 
 Local Modifications:
 No modifications.

third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_core/README.chromium

@@ -3,8 +3,8 @@ Short Name: jetifier-core
 URL: https://developer.android.com/jetpack/androidx
 Version: 1.0.0-beta08
 License: Apache Version 2.0
-License File: LICENSE
-Security Critical: yes
+License File: NOT_SHIPPED
+Security Critical: no
 
 Description:
 Android Jetifier Core

third_party/android_deps/libs/com_android_tools_build_jetifier_jetifier_processor/README.chromium

@@ -3,8 +3,8 @@ Short Name: jetifier-processor
 URL: https://developer.android.com/jetpack/androidx
 Version: 1.0.0-beta08
 License: Apache Version 2.0
-License File: LICENSE
-Security Critical: yes
+License File: NOT_SHIPPED
+Security Critical: no
 
 Description:
 Android Jetifier Processor

third_party/android_deps/libs/com_github_stephenc_jcip_jcip_annotations/README.chromium → third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine/README.chromium

-Name: JCIP Annotations under Apache License
-Short Name: jcip-annotations
-URL: http://stephenc.github.com/jcip-annotations
-Version: 1.0-1
+Name: Caffeine cache
+Short Name: caffeine
+URL: https://github.com/ben-manes/caffeine
+Version: 2.7.0
 License: Apache License, Version 2.0
 License File: NOT_SHIPPED
 Security Critical: no
 
 Description:
-A clean room implementation of the JCIP Annotations based entirely on the specification provided by the javadocs.
+A high performance caching library for Java 8+
 
 Local Modifications:
 No modifications.

third_party/android_deps/libs/com_github_stephenc_jcip_jcip_annotations/cipd.yaml → third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.0-1-cr0
-package: chromium/third_party/android_deps/libs/com_github_stephenc_jcip_jcip_annotations
-description: "JCIP Annotations under Apache License"
+# cipd create --pkg-def cipd.yaml -tag version:2.7.0-cr0
+package: chromium/third_party/android_deps/libs/com_github_ben_manes_caffeine_caffeine
+description: "Caffeine cache"
 data:
-- file: jcip-annotations-1.0-1.jar
+- file: caffeine-2.7.0.jar

third_party/android_deps/libs/com_google_errorprone_error_prone_annotation/README.chromium

 Name: @BugPattern annotation
 Short Name: error_prone_annotation
-URL: 
-Version: 2.3.3
+URL: https://errorprone.info/
+Version: 2.3.4
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_annotation/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.4-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation
 description: "@BugPattern annotation"
 data:
-- file: error_prone_annotation-2.3.3.jar
+- file: error_prone_annotation-2.3.4.jar

third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/README.chromium

 Name: error-prone annotations
 Short Name: error_prone_annotations
 URL: https://errorprone.info/
-Version: 2.3.3
+Version: 2.3.4
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.4-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations
 description: "error-prone annotations"
 data:
-- file: error_prone_annotations-2.3.3.jar
+- file: error_prone_annotations-2.3.4.jar

third_party/android_deps/libs/com_google_errorprone_error_prone_check_api/README.chromium

 Name: error-prone check api
 Short Name: error_prone_check_api
 URL: 
-Version: 2.3.3
+Version: 2.3.4
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_check_api/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.4-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api
 description: "error-prone check api"
 data:
-- file: error_prone_check_api-2.3.3.jar
+- file: error_prone_check_api-2.3.4.jar

third_party/android_deps/libs/com_google_errorprone_error_prone_core/README.chromium

 Name: error-prone library
 Short Name: error_prone_core
 URL: 
-Version: 2.3.3
+Version: 2.3.4
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_core/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.4-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core
 description: "error-prone library"
 data:
-- file: error_prone_core-2.3.3.jar
+- file: error_prone_core-2.3.4.jar

third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations/README.chromium

 Name: error-prone type annotations
 Short Name: error_prone_type_annotations
 URL: 
-Version: 2.3.3
+Version: 2.3.4
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.3.3-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.3.4-cr0
 package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations
 description: "error-prone type annotations"
 data:
-- file: error_prone_type_annotations-2.3.3.jar
+- file: error_prone_type_annotations-2.3.4.jar

third_party/android_deps/libs/commons_cli_commons_cli/README.chromium

@@ -3,8 +3,8 @@ Short Name: commons-cli
 URL: http://commons.apache.org/proper/commons-cli/
 Version: 1.3.1
 License: Apache 2.0
-License File: LICENSE
-Security Critical: yes
+License File: NOT_SHIPPED
+Security Critical: no
 
 Description:
 Apache Commons CLI provides a simple API for presenting, processing and validating a command line interface.

third_party/android_deps/libs/javax_annotation_javax_annotation_api/LICENSE

@@ -757,4 +757,3 @@ based on this library.  If you modify this library, you may extend this
 exception to your version of the library, but you are not obligated to
 do so.  If you do not wish to do so, delete this exception statement
 from your version.
-

third_party/android_deps/libs/javax_annotation_javax_annotation_api/README.chromium

-Name: Javax Annotation API
+Name: ${extension.name} API
 Short Name: javax.annotation-api
 URL: http://jcp.org/en/jsr/detail?id=250
 Version: 1.3.2

third_party/android_deps/libs/org_checkerframework_checker_qual/README.chromium

 Name: Checker Qual
 Short Name: checker-qual
 URL: https://checkerframework.org
-Version: 2.5.3
+Version: 3.0.0
 License: GPL v2 with the classpath exception
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/org_checkerframework_checker_qual/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.5.3-cr0
+# cipd create --pkg-def cipd.yaml -tag version:3.0.0-cr0
 package: chromium/third_party/android_deps/libs/org_checkerframework_checker_qual
 description: "Checker Qual"
 data:
-- file: checker-qual-2.5.3.jar
+- file: checker-qual-3.0.0.jar

third_party/android_deps/libs/org_checkerframework_dataflow/README.chromium

 Name: Dataflow
 Short Name: dataflow
 URL: https://checkerframework.org
-Version: 2.5.3
+Version: 3.0.0
 License: GPL v2 with the classpath exception
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/org_checkerframework_dataflow/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.5.3-cr0
+# cipd create --pkg-def cipd.yaml -tag version:3.0.0-cr0
 package: chromium/third_party/android_deps/libs/org_checkerframework_dataflow
 description: "Dataflow"
 data:
-- file: dataflow-2.5.3.jar
+- file: dataflow-3.0.0.jar

third_party/android_deps/libs/org_checkerframework_javacutil/README.chromium

 Name: Javacutil
 Short Name: javacutil
 URL: https://checkerframework.org
-Version: 2.5.3
+Version: 3.0.0
 License: GPL v2 with the classpath exception
 License File: NOT_SHIPPED
 Security Critical: no

third_party/android_deps/libs/org_checkerframework_javacutil/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.5.3-cr0
+# cipd create --pkg-def cipd.yaml -tag version:3.0.0-cr0
 package: chromium/third_party/android_deps/libs/org_checkerframework_javacutil
 description: "Javacutil"
 data:
-- file: javacutil-2.5.3.jar
+- file: javacutil-3.0.0.jar

third_party/android_deps/libs/org_jdom_jdom2/README.chromium

@@ -3,8 +3,8 @@ Short Name: jdom2
 URL: http://www.jdom.org
 Version: 2.0.6
 License: Similar to Apache License but with the acknowledgment clause removed
-License File: LICENSE
-Security Critical: yes
+License File: NOT_SHIPPED
+Security Critical: no
 
 Description:
 A complete, Java-based solution for accessing, manipulating, and outputting XML data

third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib/README.chromium

@@ -3,8 +3,8 @@ Short Name: kotlin-stdlib
 URL: https://kotlinlang.org/
 Version: 1.3.41
 License: The Apache License, Version 2.0
-License File: LICENSE
-Security Critical: yes
+License File: NOT_SHIPPED
+Security Critical: no
 
 Description:
 Kotlin Standard Library for JVM

third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common/README.chromium

@@ -3,8 +3,8 @@ Short Name: kotlin-stdlib-common
 URL: https://kotlinlang.org/
 Version: 1.3.41
 License: The Apache License, Version 2.0
-License File: LICENSE
-Security Critical: yes
+License File: NOT_SHIPPED
+Security Critical: no
 
 Description:
 Kotlin Common Standard Library

third_party/android_deps/libs/org_plumelib_plume_util/LICENSE

+MIT License
+
+Copyright (c) 2017 plume-lib
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

third_party/android_deps/libs/org_plumelib_plume_util/OWNERS

+file://third_party/android_deps/OWNERS
\ No newline at end of file

third_party/android_deps/libs/org_plumelib_plume_util/README.chromium

+Name: Plume-lib Util
+Short Name: plume-util
+URL: https://github.com/plume-lib/plume-util
+Version: 1.0.6
+License: MIT License
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+Utility libraries for Java.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/org_plumelib_plume_util/cipd.yaml

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:1.0.6-cr0
+package: chromium/third_party/android_deps/libs/org_plumelib_plume_util
+description: "Plume-lib Util"
+data:
+- file: plume-util-1.0.6.jar

third_party/android_deps/libs/org_plumelib_reflection_util/LICENSE

+MIT License
+
+Copyright (c) 2018 plume-lib
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

third_party/android_deps/libs/org_plumelib_reflection_util/OWNERS

+file://third_party/android_deps/OWNERS
\ No newline at end of file

third_party/android_deps/libs/org_plumelib_reflection_util/README.chromium

+Name: Reflection-util
+Short Name: reflection-util
+URL: https://github.com/plume-lib/reflection-util
+Version: 0.0.2
+License: MIT License
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+Convert among string representations of Java types.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/org_plumelib_reflection_util/cipd.yaml

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:0.0.2-cr0
+package: chromium/third_party/android_deps/libs/org_plumelib_reflection_util
+description: "Reflection-util"
+data:
+- file: reflection-util-0.0.2.jar

third_party/android_deps/libs/org_plumelib_require_javadoc/LICENSE

+MIT License
+
+Copyright (c) 2017 plume-lib
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

third_party/android_deps/libs/org_plumelib_require_javadoc/OWNERS

+file://third_party/android_deps/OWNERS
\ No newline at end of file

third_party/android_deps/libs/org_plumelib_require_javadoc/README.chromium

+Name: Plume-lib Require-Javadoc
+Short Name: require-javadoc
+URL: https://github.com/plume-lib/require-javadoc
+Version: 0.1.0
+License: MIT License
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+Require Javadoc comments to be present.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/org_plumelib_require_javadoc/cipd.yaml

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:0.1.0-cr0
+package: chromium/third_party/android_deps/libs/org_plumelib_require_javadoc
+description: "Plume-lib Require-Javadoc"
+data:
+- file: require-javadoc-0.1.0.jar