Fix inputs not defined on all paths in run_on_app.py
Change-Id: If6adb70c6c7b3ac75b6bd22651c2b61c4d3c4f19
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 582fc13..b58eafb 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -569,7 +569,6 @@
print('Valid types are {}'.format(version.keys()))
return 1
values = version[type]
- inputs = []
args.extend(['--output', outdir])
if 'min-api' in values:
@@ -578,7 +577,9 @@
if 'main-dex-list' in values:
args.extend(['--main-dex-list', values['main-dex-list']])
+ inputs = values['inputs']
libraries = values['libraries'] if 'libraries' in values else []
+
if options.compiler == 'r8':
if 'pgconf' in values and not options.k:
if has_injars_and_libraryjars(values['pgconf']):
@@ -590,6 +591,7 @@
sanitized_lib_path, sanitized_pgconf_path, values['pgconf'])
libraries = [sanitized_lib_path]
args.extend(['--pg-conf', sanitized_pgconf_path])
+ inputs = []
else:
# -injars without -libraryjars or vice versa is not supported.
check_no_injars_and_no_libraryjars(values['pgconf'])
@@ -601,7 +603,6 @@
SanitizeLibraries(
sanitized_lib_path, values['libraries'], values['inputs'])
libraries = [sanitized_lib_path]
- inputs = values['inputs']
app_provided_pg_conf = True
if options.k:
args.extend(['--pg-conf', options.k])
