Use the Errorprone Compiler

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index a5a12352a2d1f7c8716cc3d5617919513f82ea8c..1893bd62723187a4226f3b8766fc8c9b177581c7 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -749,6 +749,12 @@ template("compile_java") {
   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
@@ -812,7 +818,13 @@ template("compile_java") {
     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)
   }
 
@@ -940,6 +952,10 @@ template("java_library_impl") {
     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
     }