commit 517c7666ffe0d87248fc0a619103dde6629026ed
author Ian Zerny <zerny@google.com> Wed Jul 11 15:22:29 2018 +0200
committer Ian Zerny <zerny@google.com> Wed Jul 11 13:27:07 2018 +0000
tree 127c9c5edde3ccfab02b7c8daebda2d4b38258d3
parent 94178545e0fa13ca231f4d744f6fd9b969715b72

Suppress stdout in run_proguard_dx_on_app.py

The large amount of output was causing benchmarks to fail.

Change-Id: I2f2f196f56fe5e6f0f38e7e69386ea104aacad2e

tools/proguard.py

diff --git a/tools/proguard.py b/tools/proguard.py
index efcf560..640094f 100755
--- a/tools/proguard.py
+++ b/tools/proguard.py
@@ -15,14 +15,14 @@
 PROGUARD_JAR = os.path.join(utils.REPO_ROOT, 'third_party', 'proguard',
     'proguard_internal_159423826', 'ProGuard_deploy.jar')
 
-def run(args, track_memory_file = None):
+def run(args, track_memory_file = None, stdout=None, stderr=None):
   cmd = []
   if track_memory_file:
     cmd.extend(['tools/track_memory.sh', track_memory_file])
   cmd.extend(['java', '-jar', PROGUARD_JAR])
   cmd.extend(args)
   utils.PrintCmd(cmd)
-  subprocess.check_call(cmd)
+  subprocess.call(cmd, stdout=stdout, stderr=stderr)
 
 def Main():
   run(sys.argv[1:])

tools/run_proguard_dx_on_app.py

diff --git a/tools/run_proguard_dx_on_app.py b/tools/run_proguard_dx_on_app.py
index a953229..4624f26 100755
--- a/tools/run_proguard_dx_on_app.py
+++ b/tools/run_proguard_dx_on_app.py
@@ -115,7 +115,10 @@
     track_memory_file = None
     if options.print_memoryuse:
       track_memory_file = join(temp, utils.MEMORY_USE_TMP_FILE)
-    proguard.run(args, track_memory_file = track_memory_file)
+    proguard.run(
+        args,
+        track_memory_file = track_memory_file,
+        stdout=open(os.devnull, 'w'))
     if options.print_memoryuse:
       proguard_memoryuse = utils.grep_memoryuse(track_memory_file)