Revert of Enable Android lint by default

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
@@ skipping 37 matching lines @@
 
     with open(result_path, 'wb') as f:
       f.write(content)
 
   def _ParseAndShowResultFile():
     dom = minidom.parse(result_path)
     issues = dom.getElementsByTagName('issue')
     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)
         if error_line:
           print >> sys.stderr, error_line
     return len(issues)
 
   _ProcessConfigFile()
 
   cmd = [
       lint_path, '-Werror', '--exitcode', '--showall',
       '--config', _RelativizePath(processed_config_path),
       '--classpath', _RelativizePath(classes_dir),
       '--xml', _RelativizePath(result_path),
   ]
   for src in src_dirs:
     cmd.extend(['--sources', _RelativizePath(src)])
   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:
     # 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'
              ' - Wanna suppress these issues?\n'
              '    1. Read comment in %s\n'
              '    2. Run "python %s %s"\n' %
              (num_issues,
               _RelativizePath(result_path),
               _RelativizePath(config_path),
               _RelativizePath(os.path.join(_SRC_ROOT, 'build', 'android',
@@ skipping 40 matching lines @@
                   options.product_dir, src_dirs, options.classes_dir)
 
   if options.stamp and not rc:
     build_utils.Touch(options.stamp)
 
   return rc
 
 
 if __name__ == '__main__':
   sys.exit(main())