Compress entries when outputting CF

This will add compression to any archive build by r8 - in particular
also r8lib.

This will change the sizes since we no longer include the overhead of
the actual zip-file, so we might see some change in benchmarks.

Bug: 123375003
Change-Id: I8aa416e2a6ef98ff5df103bf7677238dd30d05ff
diff --git a/tools/run_bootstrap_benchmark.py b/tools/run_bootstrap_benchmark.py
index ad26959..9f2f7e4 100755
--- a/tools/run_bootstrap_benchmark.py
+++ b/tools/run_bootstrap_benchmark.py
@@ -60,11 +60,11 @@
       sys.exit(return_code)
 
     dex(r8_output, d8_r8_output)
-    print "BootstrapR8(CodeSize):", os.path.getsize(r8_output)
-    print "BootstrapR8Dex(CodeSize):", os.path.getsize(d8_r8_output)
+    print "BootstrapR8(CodeSize):", utils.uncompressed_size(r8_output)
+    print "BootstrapR8Dex(CodeSize):", utils.uncompressed_size(d8_r8_output)
 
     dex(PINNED_PGR8_JAR, d8_pg_output)
-    print "BootstrapR8PG(CodeSize):", os.path.getsize(PINNED_PGR8_JAR)
-    print "BootstrapR8PGDex(CodeSize):", os.path.getsize(d8_pg_output)
+    print "BootstrapR8PG(CodeSize):", utils.uncompressed_size(PINNED_PGR8_JAR)
+    print "BootstrapR8PGDex(CodeSize):", utils.uncompressed_size(d8_pg_output)
 
   sys.exit(0)