Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(654)

Unified Diff: build/android/gyp/util/proguard_util.py

Issue 2801443002: Filter extra output introduced by updating proguard (Closed)
Patch Set: Address comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/util/proguard_util.py
diff --git a/build/android/gyp/util/proguard_util.py b/build/android/gyp/util/proguard_util.py
index a965ff33271df95f81f4f3f31f6ebe2c24416af7..6fc57d9f160142cb23ea91a26b4f2378717c9060 100644
--- a/build/android/gyp/util/proguard_util.py
+++ b/build/android/gyp/util/proguard_util.py
@@ -15,15 +15,24 @@ class _ProguardOutputFilter(object):
"""
IGNORE_RE = re.compile(
- r'(?:Pro.*version|Note:|Reading|Preparing|.*:.*(?:MANIFEST\.MF|\.empty))')
+ r'(?:Pro.*version|Note:|Reading|Preparing|ProgramClass:|'
+ '.*:.*(?:MANIFEST\.MF|\.empty))')
def __init__(self):
self._last_line_ignored = False
+ self._ignore_next_line = False
def __call__(self, output):
ret = []
for line in output.splitlines(True):
- if not line.startswith(' '):
+ if self._ignore_next_line:
+ self._ignore_next_line = False
+ continue
+
+ if '***BINARY RUN STATS***' in line:
+ self._last_line_ignored = True
+ self._ignore_next_line = True
+ elif 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
@@ -199,4 +208,3 @@ class ProguardCmdBuilder(object):
}
build_utils.WriteJson(this_info, self._outjar + '.info')
-
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698