Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbb1b890 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

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

am: 1a876e21

Change-Id: Ieeb9fe468a12aeb532f35ede9879f3968441709d
parents b4a26ee4 1a876e21
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -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.