Use the Errorprone Compiler

build/java.gypi

 # Copyright (c) 2012 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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Java in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my-package_java',
@@ skipping 63 matching lines @@
     'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)',
     'compile_stamp': '<(intermediate_dir)/compile.stamp',
     'lint_stamp': '<(intermediate_dir)/lint.stamp',
     'lint_result': '<(intermediate_dir)/lint_result.xml',
     'lint_config': '<(intermediate_dir)/lint_config.xml',
     'never_lint%': 0,
     'findbugs_stamp': '<(intermediate_dir)/findbugs.stamp',
     'run_findbugs%': 0,
     'proguard_config%': '',
     'proguard_preprocess%': '0',
+    'enable_errorprone%': '0',
+    'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
     'variables': {
       'variables': {
         'proguard_preprocess%': 0,
         'emma_never_instrument%': 0,
       },
       'conditions': [
         ['proguard_preprocess == 1', {
           'javac_jar_path': '<(intermediate_dir)/<(_target_name).pre.jar'
         }, {
           'javac_jar_path': '<(jar_path)'
@@ skipping 150 matching lines @@
         },
       ],
     }],
   ],
   'actions': [
     {
       'action_name': 'javac_<(_target_name)',
       'message': 'Compiling <(_target_name) java sources',
       'variables': {
         'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java")'],
+        'conditions': [
+          ['enable_errorprone == 1', {
+            'extra_inputs': [
+              '<(errorprone_exe_path)',
+            ],
+            'extra_args': [ '--errorprone-path=<(errorprone_exe_path)' ],
+          }, {
+            'extra_inputs': [],
+            'extra_args': [ '--enable-errorprone' ],

[jbudorick, 2015/05/15 18:37:12]

Similarly here w.r.t. --errorprone-path & --enable-errorprone, except without
the double negative.

[raywilliams_chromium, 2015/05/18 19:53:24]

Done.

[raywilliams_chromium, 2015/05/18 19:53:24]

Fixed

+          }],
+        ],
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/javac.py',
         '>@(java_sources)',
         '>@(input_jars_paths)',
         '>@(additional_input_paths)',
+        '<@(extra_inputs)',
       ],
       'outputs': [
         '<(compile_stamp)',
         '<(javac_jar_path)',
       ],
       'action': [
         'python', '<(DEPTH)/build/android/gyp/javac.py',
         '--classpath=>(input_jars_paths)',
         '--src-gendirs=>(generated_src_dirs)',
         '--javac-includes=<(javac_includes)',
         '--chromium-code=<(chromium_code)',
         '--jar-path=<(javac_jar_path)',
         '--jar-excluded-classes=<(jar_excluded_classes)',
         '--stamp=<(compile_stamp)',
+        '<@(extra_args)',
         '>@(java_sources)',
       ]
     },
     {
       'action_name': 'instr_jar_<(_target_name)',
       'message': 'Instrumenting <(_target_name) jar',
       'variables': {
         'input_path': '<(jar_path)',
         'output_path': '<(jar_final_path)',
         'stamp_path': '<(instr_stamp)',
@@ skipping 53 matching lines @@
             'dex_no_locals': 1,
           }],
         ],
         'dex_input_paths': [ '<(jar_final_path)' ],
         'output_path': '<(dex_path)',
       },
       'includes': [ 'android/dex_action.gypi' ],
     },
   ],
 }