Fix bug in script that caused running on dex files to fail
Change-Id: I1c508911c6e165b93dbf17328e59d1ea4ccc93ef
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 86833b2..ddc1e47 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -87,6 +87,7 @@
return os.path.abspath(file.name)
def main():
+ app_provided_pg_conf = False;
(options, args) = ParseOptions()
outdir = options.out
data = None
@@ -131,6 +132,7 @@
if 'pgconf' in values and not options.k:
for pgconf in values['pgconf']:
args.extend(['--pg-conf', pgconf])
+ app_provided_pg_conf = True
if options.k:
args.extend(['--pg-conf', options.k])
if 'multidexrules' in values:
@@ -167,13 +169,16 @@
options.track_memory_to_file)
else:
with utils.TempDir() as temp:
- if outdir.endswith('.zip') or outdir.endswith('.jar'):
- pg_outdir = os.path.dirname(outdir)
- else:
- pg_outdir = outdir
- additional_pg_conf = GenerateAdditionalProguardConfiguration(
- temp, os.path.abspath(pg_outdir))
- args.extend(['--pg-conf', additional_pg_conf])
+ if app_provided_pg_conf:
+ # Ensure that output of -printmapping and -printseeds go to the output
+ # location and not where the app Proguard configuration places them.
+ if outdir.endswith('.zip') or outdir.endswith('.jar'):
+ pg_outdir = os.path.dirname(outdir)
+ else:
+ pg_outdir = outdir
+ additional_pg_conf = GenerateAdditionalProguardConfiguration(
+ temp, os.path.abspath(pg_outdir))
+ args.extend(['--pg-conf', additional_pg_conf])
r8.run(args, not options.no_build, not options.no_debug, options.profile,
options.track_memory_to_file)
