Add linting for java libraries/apks to gn

build/android/gyp/lint.py

Index: build/android/gyp/lint.py
diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py
index 48ab837e71bdda5937fe8b33bf4ebbbe81c130b5..c8aef922ad91a22fab32cc2c8f05257c9bbef5c8 100755
--- a/build/android/gyp/lint.py
+++ b/build/android/gyp/lint.py
@@ -20,7 +20,7 @@ _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, src_dirs, jar_path):
+             result_path, product_dir, sources, jar_path):
 
   def _RelativizePath(path):
     """Returns relative path to top-level src dir.
@@ -71,62 +71,89 @@ def _RunLint(lint_path, config_path, processed_config_path, manifest_path,
           print >> sys.stderr, error_line
     return len(issues)
 
-  _ProcessConfigFile()
-
-  cmd = [
-      lint_path, '-Werror', '--exitcode', '--showall',
-      '--config', _RelativizePath(processed_config_path),
-      '--classpath', _RelativizePath(jar_path),
-      '--xml', _RelativizePath(result_path),
-  ]
-  for src in src_dirs:
-    cmd.extend(['--sources', _RelativizePath(src)])
-  cmd.append(_RelativizePath(os.path.join(manifest_path, os.pardir)))
-
-  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
-
-    # 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()
+  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),
+    ]
+
+    # There may be multiple source files with the same basename (but in
+    # different directories). It is difficult to determine what part of the path
+    # corresponds to the java package, and so instead just link the source files
+    # into temporary directories (creating a new one whenever there is a name
+    # conflict).
+    src_dirs = []
+    def NewSourceDir():
+      new_dir = os.path.join(temp_dir, str(len(src_dirs)))
+      os.mkdir(new_dir)
+      src_dirs.append(new_dir)
+      cmd.extend(['--sources', _RelativizePath(new_dir)])
+      return new_dir
+
+    def PathInDir(d, src):
+      return os.path.join(d, os.path.basename(src))
+
+    for src in sources:
+      src_dir = None
+      for d in src_dirs:
+        if not os.path.exists(PathInDir(d, src)):
+          src_dir = d
+          break
+      if not src_dir:
+        src_dir = NewSourceDir()
+      os.symlink(os.path.abspath(src), PathInDir(src_dir, src))
+
+    cmd.append(_RelativizePath(os.path.join(manifest_path, os.pardir)))
+
+    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
 
-      _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
-      # Lint errors do not fail the build.
-      return 0
+      # 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
+
+        _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
+        # Lint errors do not fail the build.
+        return 0
 
   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',
@@ -135,6 +162,7 @@ def main():
   parser.add_option('--result-path', help='Path to XML lint result file.')
   parser.add_option('--product-dir', help='Path to product dir.')
   parser.add_option('--src-dirs', help='Directories containing java files.')
+  parser.add_option('--java-files', help='Paths to java files.')
   parser.add_option('--jar-path', help='Jar file containing class files.')
   parser.add_option('--stamp', help='Path to touch on success.')
   parser.add_option('--enable', action='store_true',
@@ -145,18 +173,30 @@ def main():
   build_utils.CheckOptions(
       options, parser, required=['lint_path', 'config_path',
                                  'processed_config_path', 'manifest_path',
-                                 'result_path', 'product_dir', 'src_dirs',
+                                 'result_path', 'product_dir',
                                  'jar_path'])
 
-  src_dirs = build_utils.ParseGypList(options.src_dirs)
-
   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, src_dirs, options.jar_path)
+                  options.product_dir, sources, options.jar_path)
+
+  if options.depfile:
+    build_utils.WriteDepfile(
+        options.depfile,
+        build_utils.GetPythonDependencies())
 
   if options.stamp and not rc:
     build_utils.Touch(options.stamp)