Update errorprone to fix java 8 issues.

This updates errorprone from 1.1.2 to 2.0.1. Version 2.0.1 includes
some fixes that lets errorprone work if you have java 8. I also
deleted the ChromiumErrorProneCompiler to just use the default
ErrorProneCompiler instead. Currently, the ChromiumErrorProneCompiler
doesn't override any default behavior and would need to be
changed a good bit to be compatible with 2.0.1.

BUG=517259

Review URL: https://codereview.chromium.org/1286613002

Cr-Commit-Position: refs/heads/master@{#345688}

1 files changed, 73 insertions, 12 deletions

diff --git a/third_party/errorprone/errorprone.gyp b/third_party/errorprone/errorprone.gyp
index 6a1c5db..90235fe 100644
--- a/third_party/errorprone/errorprone.gyp
+++ b/third_party/errorprone/errorprone.gyp
@@ -3,13 +3,49 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'errorprone_script_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
+  },
   'targets': [
     {
-      # GN: //third_party/errorprone:errorprone_java
-      'target_name': 'errorprone_java',
+      # GN: //third_party/errorprone:error_prone_annotation_java
+      'target_name': 'error_prone_annotation_jar',
       'type': 'none',
       'variables': {
-        'jar_path': 'lib/error_prone_core-1.1.2.jar',
+        'jar_path': 'lib/error_prone_annotation-2.0.1.jar',
+      },
+      'includes': [
+        '../../build/host_prebuilt_jar.gypi',
+      ]
+    },
+    {
+      # GN: //third_party/errorprone:error_prone_annotations_java
+      'target_name': 'error_prone_annotations_jar',
+      'type': 'none',
+      'variables': {
+        'jar_path': 'lib/error_prone_annotations-2.0.1.jar',
+      },
+      'includes': [
+        '../../build/host_prebuilt_jar.gypi',
+      ]
+    },
+    {
+      # GN: //third_party/errorprone:javacutil_java
+      'target_name': 'javacutil_jar',
+      'type': 'none',
+      'variables': {
+        'jar_path': 'lib/javacutil-1.8.10.jar',
+      },
+      'includes': [
+        '../../build/host_prebuilt_jar.gypi',
+      ]
+    },
+    {
+      # GN: //third_party/errorprone:dataflow_java
+      'target_name': 'dataflow_jar',
+      'type': 'none',
+      'variables': {
+        'jar_path': 'lib/dataflow-1.8.10.jar',
       },
       'includes': [
         '../../build/host_prebuilt_jar.gypi',
@@ -20,17 +56,18 @@
       'target_name': 'chromium_errorprone',
       'type': 'none',
       'variables': {
-        'src_paths': [
-          'src/org/chromium/errorprone/ChromiumErrorProneCompiler.java',
-        ],
-        'enable_errorprone': 0,
+        'jar_path': 'lib/error_prone_core-2.0.1.jar',
       },
       'dependencies': [
         '../../build/android/setup.gyp:sun_tools_java',
-        'errorprone_java',
+        '../../third_party/findbugs/findbugs.gyp:format_string_jar',
+        'error_prone_annotation_jar',
+        'error_prone_annotations_jar',
+        'javacutil_jar',
+        'dataflow_jar',
       ],
       'includes': [
-        '../../build/host_jar.gypi',
+        '../../build/host_prebuilt_jar.gypi',
       ],
       'actions': [
         {
@@ -42,14 +79,38 @@
             '<(jar_path)',
           ],
           'outputs': [
-            '<(PRODUCT_DIR)/bin.java/chromium_errorprone'
+            '<(errorprone_script_path)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/create_java_binary_script.py',
             '--output', '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
-            '--classpath=>@(input_jars_paths)',
             '--jar-path=<(jar_path)',
-            '--main-class=org.chromium.errorprone.ChromiumErrorProneCompiler',
+            '--classpath=>@(input_jars_paths)',
+            '--main-class=com.google.errorprone.ErrorProneCompiler',
+          ],
+        },
+      ],
+    },
+    {
+      # This emulates gn's datadeps fields. We don't want the errorprone jars
+      # to be added to the classpaths of targets that depend on errorprone.
+      'target_name': 'require_errorprone',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'require_errorprone',
+          'message': 'Making sure errorprone has been built.',
+          'variables': {
+            'required_file': '<(PRODUCT_DIR)/bin.java/errorprone.required',
+          },
+          'inputs': [
+            '<(errorprone_script_path)',
+          ],
+          'outputs': [
+            '<(required_file)',
+          ],
+          'action': [
+            'python', '../../build/android/gyp/touch.py', '<(required_file)',
           ],
         },
       ],