Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(589)

Unified Diff: build/android/gyp/lint.py

Issue 880083004: Change which manifest and resources are passed to lint.py. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed res_dir to resource_dir in java.gypi. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/lint/suppressions.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/lint.py
diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py
index c8aef922ad91a22fab32cc2c8f05257c9bbef5c8..74022344290e321e8390cc873dd39b17abfa3310 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, sources, jar_path):
+ result_path, product_dir, sources, jar_path, resource_dir):
def _RelativizePath(path):
"""Returns relative path to top-level src dir.
@@ -107,6 +107,7 @@ def _RunLint(lint_path, config_path, processed_config_path, manifest_path,
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):
@@ -164,6 +165,7 @@ def main():
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 --resou
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.')
@@ -174,7 +176,7 @@ def main():
options, parser, required=['lint_path', 'config_path',
'processed_config_path', 'manifest_path',
'result_path', 'product_dir',
- 'jar_path'])
+ 'jar_path', 'resource_dir'])
rc = 0
@@ -191,7 +193,8 @@ def main():
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(
« no previous file with comments | « no previous file | build/android/lint/suppressions.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698