Move compilation of R8 out in run_on_app.py to ensure proper timing
Change-Id: Ic4960beaca7d0546cb589755aa65ea9c0675c0e3
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 73c932b..440cd97 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -13,7 +13,7 @@
import time
import archive
-import as_utils
+import gradle
import gmail_data
import gmscore_data
import golem
@@ -653,7 +653,7 @@
args.extend(inputs)
- t0 = time.time()
+ t0 = None
if options.dump_args_file:
with open(options.dump_args_file, 'w') as args_file:
args_file.writelines([arg + os.linesep for arg in args])
@@ -694,8 +694,11 @@
if options.hash:
jar = os.path.join(utils.LIBS, 'r8-' + options.hash + '.jar')
main = 'com.android.tools.r8.' + options.compiler.upper()
+ if should_build(options):
+ gradle.RunGradle(['r8lib' if tool.startswith('r8lib') else 'r8'])
+ t0 = time.time()
exit_code = toolhelper.run(tool, args,
- build=should_build(options),
+ build=False,
debug=not options.no_debug,
profile=options.profile,
track_memory_file=options.track_memory_to_file,
