Use the Errorprone Compiler

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 731 matching lines @@
 
   _jar_excluded_patterns = []
   if (defined(invoker.jar_excluded_patterns)) {
     _jar_excluded_patterns += invoker.jar_excluded_patterns
   }
 
   _chromium_code = false
   if (defined(invoker.chromium_code)) {
     _chromium_code = invoker.chromium_code
   }
+
+  _enable_errorprone = false

[cjhopman, 2015/05/26 22:05:32]

this should be:
_enable_errorprone = use_errorprone_java_compiler

[raywilliams_chromium, 2015/05/26 22:37:22]

Done.

+  if (defined(invoker.enable_errorprone)) {
+    _enable_errorprone = invoker.enable_errorprone
+  }
+
   _manifest_entries = []
   if (defined(invoker.manifest_entries)) {
     _manifest_entries = invoker.manifest_entries
   }
 
   _srcjar_deps = []
   if (defined(invoker.srcjar_deps)) {
     _srcjar_deps += invoker.srcjar_deps
   }
 
@@ skipping 43 matching lines @@
       "--java-srcjars=$_rebased_java_srcjars",
       "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
       "--jar-excluded-classes=$_jar_excluded_patterns",
     ]
     foreach(e, _manifest_entries) {
       args += [ "--manifest-entry=" + e ]
     }
     if (_chromium_code) {
       args += [ "--chromium-code=1" ]
     }
-
+    if (_enable_errorprone) {
+      deps += [ "//third_party/errorprone:chromium_errorprone" ]
+      args += [
+        "--use-errorprone-path",
+        "bin/chromium_errorprone",
+      ]
+    }
     args += rebase_path(_java_files, root_build_dir)
   }
 
   _final_deps += [ ":${_template_name}__finish" ]
   process_java_prebuilt("${_template_name}__finish") {
     build_config = _build_config
     input_jar_path = _intermediate_jar_path
     output_jar_path = _final_jar_path
     if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
       proguard_preprocess = invoker.proguard_preprocess
@@ skipping 107 matching lines @@
   _final_deps += [ ":${_template_name}__compile_java" ]
   compile_java("${_template_name}__compile_java") {
     jar_path = _jar_path
     build_config = _build_config
     java_files = _java_files
     srcjar_deps = _srcjar_deps
     srcjars = _srcjars
     chromium_code = _chromium_code
     android = _requires_android
 
+    _enable_errorprone = use_errorprone_java_compiler

[cjhopman, 2015/05/26 22:05:32]

delete this line and just forward the invoker's enable_errorprone. The
compile_java template can handle checking the global flag vs the invoker's

[raywilliams_chromium, 2015/05/26 22:37:22]

Done.

+    if (defined(invoker.enable_errorprone)) {
+      _enable_errorprone = invoker.enable_errorprone
+    }
     if (defined(invoker.jar_excluded_patterns)) {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
     if (defined(invoker.proguard_preprocess)) {
       proguard_preprocess = invoker.proguard_preprocess
     }
     if (defined(invoker.proguard_config)) {
       proguard_config = invoker.proguard_config
     }
     if (defined(invoker.dist_jar_path)) {
@@ skipping 295 matching lines @@
     script = "//build/android/gyp/generate_split_manifest.py"
     outputs = [
       depfile,
       invoker.out_manifest,
     ]
     inputs = [
       invoker.main_manifest,
     ]
   }
 }