Merge "Better pattern matching and dump of warning messages." am: 6949e7ecba

am: 1a876e215b

Change-Id: Ieeb9fe468a12aeb532f35ede9879f3968441709d
This commit is contained in:
Chih-Hung Hsieh 2016-10-12 16:52:01 +00:00 committed by android-build-merger
commit fbb1b890fa
1 changed files with 4 additions and 3 deletions

View File

@ -2078,7 +2078,8 @@ def parse_input_file():
infile = open(args.buildlog, 'r')
line_counter = 0
warning_pattern = re.compile('.* warning:.*')
# handle only warning messages with a file path
warning_pattern = re.compile('^[^ ]*/[^ ]*: warning: .*')
compile_patterns()
# read the log file and classify all the warnings
@ -2103,9 +2104,9 @@ def parse_input_file():
target_variant = m.group(0)
# Return s with escaped quotation characters.
# Return s with escaped backslash and quotation characters.
def escape_string(s):
return s.replace('"', '\\"')
return s.replace('\\', '\\\\').replace('"', '\\"')
# Return s without trailing '\n' and escape the quotation characters.