Filter extra output introduced by updating proguard

build/android/gyp/util/proguard_util.py

 # Copyright 2015 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.
 
 import os
 import re
 import time
 from util import build_utils
 
 
 class _ProguardOutputFilter(object):
   """ProGuard outputs boring stuff to stdout (proguard version, jar path, etc)
   as well as interesting stuff (notes, warnings, etc). If stdout is entirely
   boring, this class suppresses the output.
   """
 
   IGNORE_RE = re.compile(
       r'(?:Pro.*version|Note:|Reading|Preparing|.*:.*(?:MANIFEST\.MF|\.empty))')
 
   def __init__(self):
     self._last_line_ignored = False
+    self._to_ignore_next_line = False

[agrieve, 2017/04/04 20:05:51]

nit: _to_ignore_next_line -> _ignore_next_line

[F, 2017/04/04 20:38:07]

Done.

 
   def __call__(self, output):
     ret = []
     for line in output.splitlines(True):
+      if self._to_ignore_next_line:
+        self._to_ignore_next_line = False
+        continue
+      
       if not line.startswith(' '):
         self._last_line_ignored = bool(self.IGNORE_RE.match(line))
       elif 'You should check if you need to specify' in line:
         self._last_line_ignored = True
+      elif '***BINARY RUN STATS***' in line:
+        self._last_line_ignored = True
+        self._to_ignore_next_line = True
 
       if not self._last_line_ignored:
         ret.append(line)
     return ''.join(ret)
 
 
 class ProguardCmdBuilder(object):
   def __init__(self, proguard_jar):
     assert os.path.exists(proguard_jar)
     self._proguard_jar_path = proguard_jar
@@ skipping 153 matching lines @@
 
     this_info = {
       'inputs': self._injars,
       'configs': self._configs,
       'mapping': self._outjar + '.mapping',
       'elapsed_time': round(time.time() - start_time),
     }
 
     build_utils.WriteJson(this_info, self._outjar + '.info')