Update errorprone to fix java 8 issues.

build/config/android/internal_rules.gni

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 
 assert(is_android)
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
@@ skipping 101 matching lines @@
       rebase_path(exclusions_file, root_build_dir),
       "--auxclasspath-gyp",
       "@FileArg($rebased_build_config:javac:classpath)",
       "--output-file",
       rebase_path(result_path, root_build_dir),
       rebase_path(jar_path, root_build_dir),
     ]
   }
 }
 
+# Generates a script in the output bin.java directory to run a java binary.
+template("java_binary_script") {
+  set_sources_assignment_filter([])
+  if (defined(invoker.testonly)) {

[jbudorick, 2015/08/23 02:56:08]

forward_variables_from(invoker, [ "testonly" ])

[mikecase (-- gone --), 2015/08/24 17:16:21]

Done

+    testonly = invoker.testonly
+  }
+
+  _main_class = invoker.main_class
+  _build_config = invoker.build_config
+  _jar_path = invoker.jar_path
+  _script_name = invoker.script_name
+
+  action(target_name) {
+    script = "//build/android/gyp/create_java_binary_script.py"
+    depfile = "$target_gen_dir/$_script_name.d"
+    java_script = "$root_build_dir/bin/$_script_name"
+    inputs = [
+      _build_config,
+    ]
+    outputs = [
+      depfile,
+      java_script,
+    ]
+    if (defined(invoker.deps)) {

[jbudorick, 2015/08/23 02:56:08]

forward_variables_from(invoker, [ "deps" ])

[mikecase (-- gone --), 2015/08/24 17:16:21]

Done

+      deps = invoker.deps
+    }
+    _rebased_build_config = rebase_path(_build_config, root_build_dir)
+    args = [
+      "--depfile",
+      rebase_path(depfile, root_build_dir),
+      "--output",
+      rebase_path(java_script, root_build_dir),
+      "--classpath=@FileArg($_rebased_build_config:java:full_classpath)",
+      "--jar-path",
+      rebase_path(_jar_path, root_build_dir),
+      "--main-class",
+      _main_class,
+    ]
+  }
+}
+
 template("dex") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
 
   assert(defined(invoker.output))
   action(target_name) {
     script = "//build/android/gyp/dex.py"
     depfile = "$target_gen_dir/$target_name.d"
@@ skipping 754 matching lines @@
   if (_supports_android) {
     dex(dex_target_name) {
       sources = [
         _jar_path,
       ]
       output = _dex_path
       deps = [ ":$process_jar_target_name" ] + _deps + _jar_deps
     }
   }
 
+  if (defined(invoker.main_class)) {
+    binary_script_target_name = "${_template_name}__java_binary_script"
+    java_binary_script(binary_script_target_name) {
+      build_config = _build_config
+      jar_path = _jar_path
+      main_class = invoker.main_class
+      script_name = _template_name
+      deps = [
+        ":$build_config_target_name",
+      ]
+    }
+  }
+
   group(target_name) {
     deps = [
       ":$process_jar_target_name",
     ]
-    if (defined(invoker.data_deps)) {
-      data_deps = invoker.data_deps
-    }
     if (_supports_android) {
       deps += [ ":$dex_target_name" ]
     }
+    data_deps = []
+    if (defined(invoker.data_deps)) {
+      data_deps += invoker.data_deps
+    }
+    if (defined(invoker.main_class)) {
+      data_deps += [ ":$binary_script_target_name" ]
+    }
   }
 }
 
 # Compiles and jars a set of java files.
 #
 # Outputs:
 #  $jar_path.jar
 #  $jar_path.jar.TOC
 #
 # Variables
@@ skipping 287 matching lines @@
     }
     if (defined(invoker.manifest_entries)) {
       manifest_entries = invoker.manifest_entries
     }
 
     supports_android = _supports_android
     deps = build_config_deps
   }
 
   if (defined(invoker.main_class)) {
-    _final_deps += [ ":${_template_name}__binary_script" ]
-    action("${_template_name}__binary_script") {
-      script = "//build/android/gyp/create_java_binary_script.py"
-      depfile = "$target_gen_dir/$target_name.d"
-      java_script = "$root_build_dir/bin/$_template_name"
-      inputs = [
-        _build_config,
-      ]
-      outputs = [
-        depfile,
-        java_script,
-      ]
-      _rebased_build_config = rebase_path(_build_config, root_build_dir)
-      args = [
-        "--depfile",
-        rebase_path(depfile, root_build_dir),
-        "--output",
-        rebase_path(java_script, root_build_dir),
-        "--classpath=@FileArg($_rebased_build_config:java:full_classpath)",
-        "--jar-path",
-        rebase_path(_jar_path, root_build_dir),
-        "--main-class",
-        invoker.main_class,
-      ]
-
+    _final_datadeps += [ ":${_template_name}__java_binary_script" ]
+    java_binary_script("${_template_name}__java_binary_script") {
+      build_config = _build_config
+      jar_path = _jar_path
+      main_class = invoker.main_class
+      script_name = _template_name
       deps = build_config_deps
     }
   }
 
   if (_supports_android) {
     if (defined(invoker.chromium_code) && invoker.chromium_code) {
       _android_manifest = "//build/android/AndroidManifest.xml"
       if (defined(invoker.android_manifest)) {
         _android_manifest = invoker.android_manifest
       }
@@ skipping 333 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }