Make lint fail builds.

build/android/gyp/lint.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 """Runs Android's lint tool."""
 
 
 import optparse
 import os
 import sys
 from xml.dom import minidom
 
 from util import build_utils
 
 
 _SRC_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                          '..', '..', '..'))
 
 
 def _RunLint(lint_path, config_path, processed_config_path, manifest_path,
-             result_path, product_dir, sources, jar_path, resource_dir=None,
-             can_fail_build=False):
+             result_path, product_dir, sources, jar_path, resource_dir=None):
 
   def _RelativizePath(path):
     """Returns relative path to top-level src dir.
 
     Args:
       path: A path relative to cwd.
     """
     return os.path.relpath(os.path.abspath(path), _SRC_ROOT)
 
   def _ProcessConfigFile():
@@ skipping 80 matching lines @@
     if os.path.exists(result_path):
       os.remove(result_path)
 
     try:
       build_utils.CheckOutput(cmd, cwd=_SRC_ROOT)
     except build_utils.CalledProcessError as e:
       # There is a problem with lint usage
       if not os.path.exists(result_path):
         print 'Something is wrong:'
         print e
-        return 0
+        return 1
 
       # There are actual lint issues
       else:
         try:
           num_issues = _ParseAndShowResultFile()
         except Exception:
           print 'Lint created unparseable xml file...'
           print 'File contents:'
           with open(result_path) as f:
             print f.read()
-          return 0
+          return 1
 
         _ProcessResultFile()
         msg = ('\nLint found %d new issues.\n'
                ' - For full explanation refer to %s\n'
                ' - Wanna suppress these issues?\n'
                '    1. Read comment in %s\n'
                '    2. Run "python %s %s"\n' %
                (num_issues,
                 _RelativizePath(result_path),
                 _RelativizePath(config_path),
                 _RelativizePath(os.path.join(_SRC_ROOT, 'build', 'android',
                                              'lint', 'suppress.py')),
                 _RelativizePath(result_path)))
         print >> sys.stderr, msg
-        return 1 if can_fail_build else 0
+        return 1
 
   return 0
 
 
 def main():
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
   parser.add_option('--lint-path', help='Path to lint executable.')
   parser.add_option('--config-path', help='Path to lint suppressions file.')
   parser.add_option('--processed-config-path',
@@ skipping 29 matching lines @@
       sources = build_utils.FindInDirectories(src_dirs, '*.java')
     elif options.java_files:
       sources = build_utils.ParseGypList(options.java_files)
     else:
       print 'One of --src-dirs or --java-files must be specified.'
       return 1
     rc = _RunLint(options.lint_path, options.config_path,
                   options.processed_config_path,
                   options.manifest_path, options.result_path,
                   options.product_dir, sources, options.jar_path,
-                  options.resource_dir, options.can_fail_build)
+                  options.resource_dir)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         build_utils.GetPythonDependencies())
 
   if options.stamp and not rc:
     build_utils.Touch(options.stamp)
 
-  return rc
+  return rc if options.can_fail_build else 0
 
 
 if __name__ == '__main__':
   sys.exit(main())