| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright 2013 The Chromium Authors. All rights reserved. | 3 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 import fnmatch | 7 import fnmatch |
| 8 import optparse | 8 import optparse |
| 9 import os | 9 import os |
| 10 import shutil | 10 import shutil |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 elif error_re.match(line): | 48 elif error_re.match(line): |
| 49 line = Colorize(line, error_re, error_color) | 49 line = Colorize(line, error_re, error_color) |
| 50 elif marker_re.match(line): | 50 elif marker_re.match(line): |
| 51 line = Colorize(line, marker_re, marker_color) | 51 line = Colorize(line, marker_re, marker_color) |
| 52 return line | 52 return line |
| 53 | 53 |
| 54 return '\n'.join(map(ApplyColor, output.split('\n'))) | 54 return '\n'.join(map(ApplyColor, output.split('\n'))) |
| 55 | 55 |
| 56 | 56 |
| 57 ERRORPRONE_OPTIONS = [ | 57 ERRORPRONE_OPTIONS = [ |
| 58 '-Xepdisable:' | |
| 59 # Something in chrome_private_java makes this check crash. | |
| 60 'com.google.errorprone.bugpatterns.ClassCanBeStatic,' | |
| 61 # These crash on lots of targets. | 58 # These crash on lots of targets. |
| 62 'com.google.errorprone.bugpatterns.WrongParameterPackage,' | 59 '-Xep:ParameterPackage:OFF', |
| 63 'com.google.errorprone.bugpatterns.GuiceOverridesGuiceInjectableMethod,' | 60 '-Xep:OverridesGuiceInjectableMethod:OFF', |
| 64 'com.google.errorprone.bugpatterns.GuiceOverridesJavaxInjectableMethod,' | 61 '-Xep:OverridesJavaxInjectableMethod:OFF', |
| 65 'com.google.errorprone.bugpatterns.ElementsCountedInLoop' | |
| 66 ] | 62 ] |
| 67 | 63 |
| 68 def DoJavac( | 64 def DoJavac( |
| 69 bootclasspath, classpath, classes_dir, chromium_code, | 65 bootclasspath, classpath, classes_dir, chromium_code, |
| 70 use_errorprone_path, java_files): | 66 use_errorprone_path, java_files): |
| 71 """Runs javac. | 67 """Runs javac. |
| 72 | 68 |
| 73 Builds |java_files| with the provided |classpath| and puts the generated | 69 Builds |java_files| with the provided |classpath| and puts the generated |
| 74 .class files into |classes_dir|. If |chromium_code| is true, extra lint | 70 .class files into |classes_dir|. If |chromium_code| is true, extra lint |
| 75 checking will be enabled. | 71 checking will be enabled. |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 input_files + build_utils.GetPythonDependencies()) | 308 input_files + build_utils.GetPythonDependencies()) |
| 313 | 309 |
| 314 if options.stamp: | 310 if options.stamp: |
| 315 build_utils.Touch(options.stamp) | 311 build_utils.Touch(options.stamp) |
| 316 | 312 |
| 317 | 313 |
| 318 if __name__ == '__main__': | 314 if __name__ == '__main__': |
| 319 sys.exit(main(sys.argv[1:])) | 315 sys.exit(main(sys.argv[1:])) |
| 320 | 316 |
| 321 | 317 |
| OLD | NEW |