Reland of md5check'ify lint.py

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):
+def _OnStaleMd5(changes, lint_path, config_path, processed_config_path,
+                manifest_path, result_path, product_dir, sources, jar_path,
+                resource_dir=None, can_fail_build=False):
 
   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 30 matching lines @@
       else:
         # Issues in class files don't have a line number.
         error = '%s %s: %s [warning]' % (path, message, issue_id)
       print >> sys.stderr, error.encode('utf-8')
       for attr in ['errorLine1', 'errorLine2']:
         error_line = issue.getAttribute(attr)
         if error_line:
           print >> sys.stderr, error_line.encode('utf-8')
     return len(issues)
 
+  # Need to include all sources when a resource_dir is set so that resources are
+  # not marked as unused.
+  if not resource_dir and changes.AddedOrModifiedOnly():
+    changed_paths = set(changes.IterChangedPaths())
+    sources = [s for s in sources if s in changed_paths]
+
   with build_utils.TempDir() as temp_dir:
     _ProcessConfigFile()
 
     cmd = [
         _RelativizePath(lint_path), '-Werror', '--exitcode', '--showall',
         '--config', _RelativizePath(processed_config_path),
         '--classpath', _RelativizePath(jar_path),
         '--xml', _RelativizePath(result_path),
     ]
     if resource_dir:
@@ skipping 30 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 1
+        raise
 
       # There are actual lint issues
       else:
         try:
           num_issues = _ParseAndShowResultFile()
         except Exception: # pylint: disable=broad-except
           print 'Lint created unparseable xml file...'
           print 'File contents:'
           with open(result_path) as f:
             print f.read()
-          return 1
+          raise
 
         _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
-
-  return 0
+        if can_fail_build:
+          raise Exception('Lint failed.')
 
 
 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',
                     help='Path to processed lint suppressions file.')
   parser.add_option('--manifest-path', help='Path to AndroidManifest.xml')
@@ skipping 11 matching lines @@
                     help='Run lint instead of just touching stamp.')
 
   options, _ = parser.parse_args()
 
   build_utils.CheckOptions(
       options, parser, required=['lint_path', 'config_path',
                                  'processed_config_path', 'manifest_path',
                                  'result_path', 'product_dir',
                                  'jar_path'])
 
-  rc = 0
-
   if options.enable:
     sources = []
     if options.src_dirs:
       src_dirs = build_utils.ParseGypList(options.src_dirs)
       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)
 
-  if options.depfile:
-    build_utils.WriteDepfile(
-        options.depfile,
-        build_utils.GetPythonDependencies())
+    input_paths = [
+        options.lint_path,
+        options.config_path,
+        options.manifest_path,
+        options.jar_path,
+    ]
+    input_paths.extend(sources)
+    if options.resource_dir:
+      input_paths.extend(build_utils.FindInDirectory(options.resource_dir, '*'))
 
-  if options.stamp and not rc:
-    build_utils.Touch(options.stamp)
+    input_strings = [ options.processed_config_path ]
+    output_paths = [ options.result_path ]
 
-  return rc if options.can_fail_build else 0
+    build_utils.CallAndWriteDepfileIfStale(
+        lambda changes: _OnStaleMd5(changes, options.lint_path,
+                                    options.config_path,
+                                    options.processed_config_path,
+                                    options.manifest_path, options.result_path,
+                                    options.product_dir, sources,
+                                    options.jar_path,
+                                    resource_dir=options.resource_dir,
+                                    can_fail_build=options.can_fail_build),
+        options,
+        input_paths=input_paths,
+        input_strings=input_strings,
+        output_paths=output_paths,
+        pass_changes=True)
 
 
 if __name__ == '__main__':
   sys.exit(main())