Enable Android lint by default

BUG=393235

Review URL: https://codereview.chromium.org/396293002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@287676 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/buildbot/bb_run_bot.py

@@ -158,7 +158,7 @@ def GetBotStepMap():
         H(compile_step + std_host_tests, experimental, target_arch='x86')),
       B('fyi-builder-dbg',
         H(std_build_steps + std_host_tests, experimental,
-          extra_gyp='emma_coverage=1 android_lint=1')),
+          extra_gyp='emma_coverage=1')),
       B('x86-builder-dbg',
         H(compile_step + std_host_tests, target_arch='x86')),
       B('fyi-builder-rel', H(std_build_steps,  experimental)),

android/gyp/lint.py

@@ -55,17 +55,15 @@ def _RunLint(lint_path, config_path, processed_config_path, manifest_path,
     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 [%s]' % (path, line, severity, message,
-                                       issue_id)
+        error = '%s:%s %s: %s [warning]' % (path, line, message, issue_id)
       else:
         # Issues in class files don't have a line number.
-        error = '%s %s: %s [%s]' % (path, severity, message, issue_id)
+        error = '%s %s: %s [warning]' % (path, message, issue_id)
       print >> sys.stderr, error
       for attr in ['errorLine1', 'errorLine2']:
         error_line = issue.getAttribute(attr)
@@ -94,9 +92,18 @@ def _RunLint(lint_path, config_path, processed_config_path, manifest_path,
     # There is a problem with lint usage
     if not os.path.exists(result_path):
       raise
+
     # There are actual lint issues
     else:
-      num_issues = _ParseAndShowResultFile()
+      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
+
       _ProcessResultFile()
       msg = ('\nLint found %d new issues.\n'
              ' - For full explanation refer to %s\n'

common.gypi

@@ -1222,7 +1222,7 @@
     'emma_filter%': '',
 
     # Set to 1 to enable running Android lint on java/class files.
-    'android_lint%': 0,
+    'android_lint%': 1,
 
     # Although base/allocator lets you select a heap library via an
     # environment variable, the libcmt shim it uses sometimes gets in