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

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

Issue 1828693002: Reland of Android: Run lint using a cache in the output directory (fix-up) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 years, 9 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 | « build/android/android_lint_cache.gyp ('k') | build/android/lint_action.gypi » ('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 9814bf0a0c94c790cb6ab67743b345e06f7c548b..78d97636a872d29c9c20a7b0309a449268739a23 100755
--- a/build/android/gyp/lint.py
+++ b/build/android/gyp/lint.py
@@ -130,11 +130,16 @@ def _OnStaleMd5(changes, lint_path, config_path, processed_config_path,
os.remove(result_path)
env = {}
+ stderr_filter = None
if cache_dir:
+ # When _JAVA_OPTIONS is set, java prints to stderr:
+ # Picked up _JAVA_OPTIONS: ...
env['_JAVA_OPTIONS'] = '-Duser.home=%s' % _RelativizePath(cache_dir)
+ stderr_filter = lambda l: '' if '_JAVA_OPTIONS' in l else l
mlopatkin 2016/04/06 22:03:11 Sorry for posting in this closed review but I supp
agrieve 2016/04/06 23:55:33 ooo, nice catch! the intention was to just hide th
try:
- build_utils.CheckOutput(cmd, cwd=_SRC_ROOT, env=env or None)
+ build_utils.CheckOutput(cmd, cwd=_SRC_ROOT, env=env or None,
+ stderr_filter=stderr_filter)
except build_utils.CalledProcessError:
if can_fail_build:
traceback.print_exc()
@@ -186,12 +191,14 @@ def main():
help='Path to product dir.')
parser.add_argument('--result-path', required=True,
help='Path to XML lint result file.')
-
- parser.add_argument('--build-tools-version',
- help='Version of the build tools in the Android SDK.')
- parser.add_argument('--cache-dir',
+ parser.add_argument('--cache-dir', required=True,
help='Path to the directory in which the android cache '
'directory tree should be stored.')
+ parser.add_argument('--platform-xml-path', required=True,
+ help='Path to api-platforms.xml')
+ parser.add_argument('--create-cache', action='store_true',
+ help='Mark the lint cache file as an output rather than '
+ 'an input.')
parser.add_argument('--can-fail-build', action='store_true',
help='If set, script will exit with nonzero exit status'
' if lint errors are present')
@@ -205,8 +212,6 @@ def main():
help='Paths to java files.')
parser.add_argument('--manifest-path',
help='Path to AndroidManifest.xml')
- parser.add_argument('--platform-xml-path',
- help='Path to api-platforms.xml')
parser.add_argument('--processed-config-path',
help='Path to processed lint suppressions file.')
parser.add_argument('--resource-dir',
@@ -235,6 +240,7 @@ def main():
input_paths = [
args.lint_path,
+ args.platform_xml_path,
]
if args.config_path:
input_paths.append(args.config_path)
@@ -242,8 +248,6 @@ def main():
input_paths.append(args.jar_path)
if args.manifest_path:
input_paths.append(args.manifest_path)
- if args.platform_xml_path:
- input_paths.append(args.platform_xml_path)
if args.resource_dir:
input_paths.extend(build_utils.FindInDirectory(args.resource_dir, '*'))
if sources:
@@ -254,12 +258,6 @@ def main():
input_strings.append(args.processed_config_path)
output_paths = [ args.result_path ]
- if args.cache_dir:
- if not args.build_tools_version:
- parser.error('--cache-dir specified without --build-tools-version')
- output_paths.append(os.path.join(
- args.cache_dir, '.android', 'cache',
- 'api-versions-6-%s.bin' % args.build_tools_version))
build_utils.CallAndWriteDepfileIfStale(
lambda changes: _OnStaleMd5(changes, args.lint_path,
« no previous file with comments | « build/android/android_lint_cache.gyp ('k') | build/android/lint_action.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698