Fix up proguard output filtering

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
 from util import build_utils
 
-def FilterProguardOutput(output):
-  '''ProGuard outputs boring stuff to stdout (proguard version, jar path, etc)
+
+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 method suppresses the output.
-  '''
-  ignore_patterns = [
-    'ProGuard, version ',
-    'Reading program jar [',
-    'Reading library jar [',
-    'Preparing output jar [',
-    '  Copying resources from program jar [',
-  ]
-  for line in output.splitlines():
-    for pattern in ignore_patterns:
-      if line.startswith(pattern):
-        break
-    else:
-      # line doesn't match any of the patterns; it's probably something worth
-      # printing out.
-      return output
-  return ''
+  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
+
+  def __call__(self, output):
+    ret = []
+    for line in output.splitlines(True):
+      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
+
+      if not self._last_line_ignored:

[Nico, 2016/01/05 22:22:21]

Ooh I see, I was misreading this.

+        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
     self._tested_apk_info_path = None
     self._tested_apk_info = None
     self._mapping = None
     self._libraries = None
@@ skipping 99 matching lines @@
     inputs = [self._proguard_jar_path] + self._configs + self._injars
     if self._mapping:
       inputs.append(self._mapping)
     if self._libraries:
       inputs += self._libraries
     if self._tested_apk_info_path:
       inputs += [self._tested_apk_info_path]
     return inputs
 
 
-  def CheckOutput(self):
+  def CheckOutput(self, verbose=False):
     self.build()
     # Proguard will skip writing these files if they would be empty. Create
     # empty versions of them all now so that they are updated as the build
     # expects.
     open(self._outjar + '.dump', 'w').close()
     open(self._outjar + '.seeds', 'w').close()
     open(self._outjar + '.usage', 'w').close()
     open(self._outjar + '.mapping', 'w').close()
+    # Warning: and Error: are sent to stderr, but messages and Note: are sent
+    # to stdout.
+    stdout_filter = None
+    stderr_filter = None
+    if not verbose:
+      stdout_filter = _ProguardOutputFilter()
+      stderr_filter = _ProguardOutputFilter()
     build_utils.CheckOutput(self._cmd, print_stdout=True,
-                            stdout_filter=FilterProguardOutput)
+                            print_stderr=True,
+                            stdout_filter=stdout_filter,
+                            stderr_filter=stderr_filter)
 
     this_info = {
       'inputs': self._injars,
       'configs': self._configs,
       'mapping': self._outjar + '.mapping',
     }
 
     build_utils.WriteJson(this_info, self._outjar + '.info')