Android: Update errorprone to 2.1.3

https://groups.google.com/d/topic/error-prone-announce/-ExdzeDOURY/discussion

BUG=793900

Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ic4e3c7b3a39a64a4c1ef85c0ce5db770b33dba4b
Reviewed-on: https://chromium-review.googlesource.com/820530Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525344}

DEPS

@@ -344,7 +344,7 @@ deps = {
   },
 
   'src/third_party/errorprone/lib': {
-      'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '635c410fc42614b48518ae6818105bc83af88497',
+      'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '0fce89415c910ed2196f4bddf601ffddd90504fa',
       'condition': 'checkout_android',
   },
 

build/android/gyp/javac.py

@@ -390,13 +390,13 @@ def main(argv):
   javac_cmd = [javac_path]
 
   javac_cmd.extend((
-      '-g',
-      # Chromium only allows UTF8 source files.  Being explicit avoids
-      # javac pulling a default encoding from the user's environment.
-      '-encoding', 'UTF-8',
-      # Prevent compiler from compiling .java files not listed as inputs.
-      # See: http://blog.ltgt.net/most-build-tools-misuse-javac/
-      '-sourcepath', ':',
+    '-g',
+    # Chromium only allows UTF8 source files.  Being explicit avoids
+    # javac pulling a default encoding from the user's environment.
+    '-encoding', 'UTF-8',
+    # Prevent compiler from compiling .java files not listed as inputs.
+    # See: http://blog.ltgt.net/most-build-tools-misuse-javac/
+    '-sourcepath', ':',
   ))
 
   if options.java_version:

build/android/gyp/write_build_config.py

@@ -613,6 +613,9 @@ def main(argv):
     # rebuilt.
     javac_interface_classpath = [
         c['interface_jar_path'] for c in direct_library_deps]
+    # The classpath used for error prone.
+    javac_full_interface_classpath = [
+        c['interface_jar_path'] for c in all_library_deps]
     # The classpath used for bytecode-rewritting.
     javac_full_classpath = [c['unprocessed_jar_path'] for c in all_library_deps]
     # The classpath to use to run this target (or as an input to ProGuard).
@@ -633,6 +636,8 @@ def main(argv):
     extra_jars = [p for p in extra_jars if p not in javac_classpath]
     javac_classpath.extend(extra_jars)
     javac_interface_classpath.extend(extra_jars)
+    javac_full_interface_classpath.extend(
+        p for p in extra_jars if p not in javac_full_classpath)
     javac_full_classpath.extend(
         p for p in extra_jars if p not in javac_full_classpath)
     if extra_jars:
@@ -671,7 +676,13 @@ def main(argv):
     # Include in the classpath classes that are added directly to the apk under
     # test (those that are not a part of a java_library).
     javac_classpath.append(tested_apk_config['unprocessed_jar_path'])
+    javac_full_classpath.append(tested_apk_config['unprocessed_jar_path'])
     javac_interface_classpath.append(tested_apk_config['interface_jar_path'])
+    javac_full_interface_classpath.append(
+        tested_apk_config['interface_jar_path'])
+    javac_full_interface_classpath.extend(
+        p for p in tested_apk_config['javac_full_interface_classpath']
+        if p not in javac_full_interface_classpath)
     javac_full_classpath.extend(
         p for p in tested_apk_config['javac_full_classpath']
         if p not in javac_full_classpath)
@@ -721,6 +732,7 @@ def main(argv):
     config['javac']['processor_classes'] = [
         c['main_class'] for c in processor_deps.Direct()]
     deps_info['javac_full_classpath'] = javac_full_classpath
+    deps_info['javac_full_interface_classpath'] = javac_full_interface_classpath
 
     if options.type in (
         'android_apk', 'dist_jar', 'java_binary', 'junit_binary'):

build/config/android/internal_rules.gni

@@ -2176,8 +2176,8 @@ if (enable_java_templates) {
         "--java-srcjars=$_rebased_java_srcjars",
         "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
         "--java-version=1.8",
-        "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
-        "--interface-classpath=@FileArg($_rebased_build_config:javac:interface_classpath)",
+        "--classpath=@FileArg($_rebased_build_config:deps_info:javac_full_classpath)",
+        "--interface-classpath=@FileArg($_rebased_build_config:deps_info:javac_full_interface_classpath)",
         "--processorpath=@FileArg($_rebased_build_config:javac:processor_classpath)",
         "--processors=@FileArg($_rebased_build_config:javac:processor_classes)",
       ]

third_party/errorprone/BUILD.gn

@@ -6,7 +6,7 @@ import("//build/config/android/rules.gni")
 
 if (current_toolchain == default_toolchain) {
   java_library("errorprone_java") {
-    jar_path = "lib/error_prone_ant-2.1.2.jar"
+    jar_path = "lib/error_prone_ant-2.1.3.jar"
   }
 
   java_binary("errorprone") {
@@ -14,6 +14,6 @@ if (current_toolchain == default_toolchain) {
       ":errorprone_java",
     ]
     main_class = "com.google.errorprone.ErrorProneCompiler"
-    bootclasspath = "$root_build_dir/lib.java/third_party/errorprone/error_prone_ant-2.1.2.jar"
+    bootclasspath = "$root_build_dir/lib.java/third_party/errorprone/error_prone_ant-2.1.3.jar"
   }
 }

third_party/errorprone/README.chromium

 Name: Error Prone
 Short Name: errorprone
 URL: http://errorprone.info/
-Version: 2.1.2
-Date: November 9, 2017
+Version: 2.1.3
+Date: December 11, 2017
 License: Apache 2.0
 License File: NOT_SHIPPED
 Security Critical: no