Index: build/android/gyp/lint.py |
diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py |
index 910562bae31c33ff007cdc4199b8b80798c07318..6ae7a32e4ed90bb4e297477064266c060efd4768 100755 |
--- a/build/android/gyp/lint.py |
+++ b/build/android/gyp/lint.py |
@@ -55,15 +55,17 @@ |
print >> sys.stderr |
for issue in issues: |
issue_id = issue.attributes['id'].value |
+ severity = issue.attributes['severity'].value |
message = issue.attributes['message'].value |
location_elem = issue.getElementsByTagName('location')[0] |
path = location_elem.attributes['file'].value |
line = location_elem.getAttribute('line') |
if line: |
- error = '%s:%s %s: %s [warning]' % (path, line, message, issue_id) |
+ error = '%s:%s %s: %s [%s]' % (path, line, severity, message, |
+ issue_id) |
else: |
# Issues in class files don't have a line number. |
- error = '%s %s: %s [warning]' % (path, message, issue_id) |
+ error = '%s %s: %s [%s]' % (path, severity, message, issue_id) |
print >> sys.stderr, error |
for attr in ['errorLine1', 'errorLine2']: |
error_line = issue.getAttribute(attr) |
@@ -92,18 +94,9 @@ |
# There is a problem with lint usage |
if not os.path.exists(result_path): |
raise |
- |
# 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 |
- |
+ num_issues = _ParseAndShowResultFile() |
_ProcessResultFile() |
msg = ('\nLint found %d new issues.\n' |
' - For full explanation refer to %s\n' |