Update how gmscore tests are run
* Use --no-desugar, as the code is already desugared
* Use the main-dex generated by the build list
This leads to not requiring any min-api.
Change-Id: I49bcfaced1d5b77681a8ca7a8ec96523623147b3
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index bab9b32..f2cd0e0 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -217,6 +217,9 @@
if 'min-api' in values:
args.extend(['--min-api', values['min-api']])
+ if 'main-dex-list' in values:
+ args.extend(['--main-dex-list', values['main-dex-list']])
+
if options.compiler == 'r8':
if 'pgconf' in values and not options.k:
for pgconf in values['pgconf']:
@@ -236,10 +239,14 @@
and not os.path.exists(outdir):
os.makedirs(outdir)
+ # Additional flags for the compiler from the configuration file.
+ if 'flags' in values:
+ args.extend(values['flags'].split(' '))
if options.compiler == 'r8':
if 'r8-flags' in values:
args.extend(values['r8-flags'].split(' '))
+ # Additional flags for the compiler from the command line.
if options.compiler_flags:
args.extend(options.compiler_flags.split(' '))
if options.r8_flags:
