Handle temporary file paths in suppress.py.

build/android/lint/suppress.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.
 
 """Add all generated lint_result.xml files to suppressions.xml"""
 
 # pylint: disable=no-member
 
 
 import collections
 import optparse
 import os
+import re
 import sys
 from xml.dom import minidom
 
 _BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.append(_BUILD_ANDROID_DIR)
 
 from pylib.constants import host_paths
 
-
+_TMP_DIR_RE = re.compile(r'^/tmp/.*/(SRC_ROOT[0-9]+|PRODUCT_DIR)/')
 _THIS_FILE = os.path.abspath(__file__)
 _CONFIG_PATH = os.path.join(os.path.dirname(_THIS_FILE), 'suppressions.xml')
 _DOC = (
     '\nSTOP! It looks like you want to suppress some lint errors:\n'
     '- Have you tried identifing the offending patch?\n'
     '  Ask the author for a fix and/or revert the patch.\n'
     '- It is preferred to add suppressions in the code instead of\n'
     '  sweeping it under the rug here. See:\n\n'
     '    http://developer.android.com/tools/debugging/improving-w-lint.html\n'
     '\n'
@@ skipping 34 matching lines @@
   return issues_dict
 
 
 def _ParseAndMergeResultFile(result_path, issues_dict):
   print 'Parsing and merging %s' % result_path
   dom = minidom.parse(result_path)
   for issue in dom.getElementsByTagName('issue'):
     issue_id = issue.attributes['id'].value
     severity = issue.attributes['severity'].value
     path = issue.getElementsByTagName('location')[0].attributes['file'].value
+    # Strip temporary file path and use regex instead of path.
+    regexp = re.sub(_TMP_DIR_RE, '', path)
     if issue_id not in issues_dict:
       issues_dict[issue_id] = _Issue(severity, set(), set())
-    issues_dict[issue_id].paths.add(path)
+    issues_dict[issue_id].regexps.add(regexp)
 
 
 def _WriteConfigFile(config_path, issues_dict):
   new_dom = minidom.getDOMImplementation().createDocument(None, 'lint', None)
   top_element = new_dom.documentElement
   top_element.appendChild(new_dom.createComment(_DOC))
   for issue_id, issue in sorted(issues_dict.iteritems(), key=lambda i: i[0]):
     issue_element = new_dom.createElement('issue')
     issue_element.attributes['id'] = issue_id
     if issue.severity:
@@ skipping 27 matching lines @@
   _, args = parser.parse_args()
 
   if len(args) != 1 or not os.path.exists(args[0]):
     parser.error('Must provide RESULT-FILE')
 
   _Suppress(_CONFIG_PATH, args[0])
 
 
 if __name__ == '__main__':
   main()