Use the Errorprone Compiler

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 05431564017147fdb31b9fe704f3810526c821f5..8fbaebf6a49f6e7f787c49807331a494a8c9b06c 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -208,6 +208,8 @@
     'native_lib_placeholder_stamp': '<(apk_package_native_libs_dir)/<(android_app_abi)/native_lib_placeholder.stamp',
     'native_lib_placeholders': [],
     'main_apk_name': '<(apk_name)',
+    'enable_errorprone%': '1',
+    'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
@@ -250,6 +252,11 @@
         '<(DEPTH)/base/base.gyp:chromium_android_linker',
       ],
     }],
+    ['enable_errorprone == 1', {
+      'dependencies': [

[jbudorick, 2015/05/28 15:38:00]

Why is this only added to dependencies here in java_apk.gypi? Should we also be
doing this in host_jar.gypi and java.gypi?

[raywilliams_chromium, 2015/05/28 17:59:11]

Done.

[raywilliams_chromium, 2015/05/28 17:59:11]

added to conditions in the other two jars

+        '<(DEPTH)/third_party/errorprone/errorprone.gyp:chromium_errorprone',
+      ],
+    }],
     ['native_lib_target != ""', {
       'variables': {
         'conditions': [
@@ -807,7 +814,14 @@
         # targets use the same java_in_dir and both use java_apk.gypi or
         # both use java.gypi.)
         'java_sources': ['>!@(find >(java_in_dir)>(java_in_dir_suffix) >(additional_src_dirs) -name "*.java"  # apk)'],
-
+        'conditions': [
+          ['enable_errorprone == 1', {
+            'extra_inputs': [
+              '<(errorprone_exe_path)',
+            ],
+            'extra_args': [ '--use-errorprone-path=<(errorprone_exe_path)' ],
+          }],
+        ],
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
@@ -815,6 +829,7 @@
         '>@(java_sources)',
         '>@(input_jars_paths)',
         '<(codegen_stamp)',
+        '<@(extra_inputs)',
       ],
       'conditions': [
         ['native_lib_target != ""', {
@@ -834,6 +849,7 @@
         '--jar-path=<(javac_jar_path)',
         '--jar-excluded-classes=<(jar_excluded_classes)',
         '--stamp=<(compile_stamp)',
+        '<@(extra_args)',
         '>@(java_sources)',
       ],
     },