summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2016-03-22 09:25:04 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-22 16:26:04 +0000
commit9b3bf41daf469e33cf6bae9ef6c13d6c213bedb8 (patch)
tree295ff04ff22bab8cb634202e364e47f7ee950119 /build
parent0bf0fab6adf072d7e4d591e40eed77f5b22f9b5a (diff)
downloadchromium_src-9b3bf41daf469e33cf6bae9ef6c13d6c213bedb8.zip
chromium_src-9b3bf41daf469e33cf6bae9ef6c13d6c213bedb8.tar.gz
chromium_src-9b3bf41daf469e33cf6bae9ef6c13d6c213bedb8.tar.bz2
[Android] Make lint XML parsing failures nonfatal without --can-fail-build.
BUG=583661 Review URL: https://codereview.chromium.org/1817943005 Cr-Commit-Position: refs/heads/master@{#382582}
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/gyp/lint.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py
index 2d3c79b..9814bf0 100755
--- a/build/android/gyp/lint.py
+++ b/build/android/gyp/lint.py
@@ -153,6 +153,8 @@ def _OnStaleMd5(changes, lint_path, config_path, processed_config_path,
print 'File contents:'
with open(result_path) as f:
print f.read()
+ if not can_fail_build:
+ return
raise
_ProcessResultFile()