Change which manifest and resources are passed to 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):
+             result_path, product_dir, sources, jar_path, resource_dir):
 
   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 66 matching lines @@
     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.extend(['--resources', _RelativizePath(resource_dir)])
     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):
@@ skipping 37 matching lines @@
   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')
   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('--resource-dir', help='Path to resource dir.')

[cjhopman, 2015/02/11 02:05:09]

I think my slight preference would be that --resource-dir is optional
(eventually I'd like to be able to get rid of the build/android/ant/res
directory).

[mikecase (-- gone --), 2015/02/11 19:04:24]

Done.

   parser.add_option('--stamp', help='Path to touch on success.')
   parser.add_option('--enable', action='store_true',
                     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'])
+                                 'jar_path', 'resource_dir'])
 
   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.product_dir, sources, options.jar_path,
+                  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
 
 
 if __name__ == '__main__':
   sys.exit(main())