Use the Errorprone Compiler

build/android/gyp/javac.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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 fnmatch
 import optparse
 import os
 import shutil
@@ skipping 37 matching lines @@
     elif error_re.match(line):
       line = Colorize(line, error_re, error_color)
     elif marker_re.match(line):
       line = Colorize(line, marker_re, marker_color)
     return line
 
   return '\n'.join(map(ApplyColor, output.split('\n')))
 
 
 def DoJavac(
-    classpath, classes_dir, chromium_code, java_files):
+    classpath, classes_dir, chromium_code,
+    use_errorprone, errorprone_path, java_files):
   """Runs javac.
 
   Builds |java_files| with the provided |classpath| and puts the generated
   .class files into |classes_dir|. If |chromium_code| is true, extra lint
   checking will be enabled.
   """
 
   jar_inputs = []
   for path in classpath:
     if os.path.exists(path + '.TOC'):
@@ skipping 12 matching lines @@
       '-d', classes_dir]
   if chromium_code:
     # TODO(aurimas): re-enable '-Xlint:deprecation' checks once they are fixed.
     javac_args.extend(['-Xlint:unchecked'])
   else:
     # XDignore.symbol.file makes javac compile against rt.jar instead of
     # ct.sym. This means that using a java internal package/class will not
     # trigger a compile warning or error.
     javac_args.extend(['-XDignore.symbol.file'])
 
-  javac_cmd = ['javac'] + javac_args + java_files
+  def GetErrorproneCommand():

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

This should not be done with a local function.

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

Done.

+    disabled_checks = [
+      # Something in chrome_private_java makes this check crash.
+      'ClassCanBeStatic',
+      # These crash on lots of targets.
+      'WrongParameterPackage',
+      'GuiceOverridesGuiceInjectableMethod',
+      'GuiceOverridesJavaxInjectableMethod',
+      'ElementsCountedInLoop',
+    ]
+    errorprone_options = [

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

errorprone_options can just be a constant, right?

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

Hmm... I don't think python has constants. I can kill the helper method and put
this back as a regular var (like in patch-set 1). Let me know if you want me to
do that.

[jbudorick, 2015/05/18 19:58:32]

Python doesn't have constants in that the interpreter won't enforce constants,
but conventionally ALL_CAPS_WITH_UNDERSCORES denotes a constant
(https://google-styleguide.googlecode.com/svn/trunk/pyguide.html?showone=Namin...).
We typically use these at module scope (though there are some uses of
class-scope constants), and that's what I'd advise doing here.

[raywilliams_chromium, 2015/05/18 20:50:23]

cool - extracted constant
and re-tested to make sure it works :)

[raywilliams_chromium, 2015/05/18 20:50:23]

Done.

+      '-Xepdisable:' + ','.join(
+        ['com.google.errorprone.bugpatterns.' + s for s in disabled_checks])
+    ]
+    return [errorprone_path] + errorprone_options
+
+  if use_errorprone:
+    javac_cmd = GetErrorproneCommand()
+  else:
+    javac_cmd = ['javac']
+
+  javac_cmd = javac_cmd + javac_args + java_files
 
   def Compile():
     build_utils.CheckOutput(
         javac_cmd,
         print_stdout=chromium_code,
         stderr_filter=ColorJavacOutput)
 
   record_path = os.path.join(classes_dir, 'javac.md5.stamp')
   md5_check.CallAndRecordIfStale(
       Compile,
@@ skipping 74 matching lines @@
       '--jar-excluded-classes',
       default='',
       help='List of .class file patterns to exclude from the jar.')
 
   parser.add_option(
       '--chromium-code',
       type='int',
       help='Whether code being compiled should be built with stricter '
       'warnings for chromium code.')
 
   parser.add_option(

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

Do we need both of these options? Passing --enable-errorprone means
--errorprone-path is required, and passing --errorprone-path without
--enable-errorprone is meaningless. What if --errorprone-path did both?

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

Done.

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

Good idea :)

+      '--enable-errorprone',
+      action='store_true',
+      help='Use this to enable use of the errorprone compiler.')
+  parser.add_option(
+      '--errorprone-path',
+      help='Path to the errorprone compiler executable.')
+
+  parser.add_option(
       '--classes-dir',
       help='Directory for compiled .class files.')
   parser.add_option('--jar-path', help='Jar output path.')
   parser.add_option(
       '--main-class',
       help='The class containing the main method.')
   parser.add_option(
       '--manifest-entry',
       action='append',
       help='Key:value pairs to add to the .jar manifest.')
@@ skipping 36 matching lines @@
         for include in javac_includes:
           if fnmatch.fnmatch(f, include):
             filtered_java_files.append(f)
             break
       java_files = filtered_java_files
 
     DoJavac(
         classpath,
         classes_dir,
         options.chromium_code,
+        options.chromium_code and options.enable_errorprone,
+        options.errorprone_path,
         java_files)
 
     if options.jar_path:
       if options.main_class or options.manifest_entry:
         if options.manifest_entry:
           entries = map(lambda e: e.split(":"), options.manifest_entry)
         else:
           entries = []
         manifest_file = os.path.join(temp_dir, 'manifest')
         CreateManifest(manifest_file, classpath, options.main_class, entries)
@@ skipping 19 matching lines @@
         input_files + build_utils.GetPythonDependencies())
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))