Use --nolib for generating historic benchmark data
Change-Id: I3268efe99f10bd11b0a06b005e7030a5f9fb9616
diff --git a/tools/perf.py b/tools/perf.py
index 32d657a..212f5f5 100755
--- a/tools/perf.py
+++ b/tools/perf.py
@@ -139,7 +139,7 @@
if options.verbose:
base_cmd.append('--verbose')
if options.version:
- base_cmd.extend(['--version', options.version])
+ base_cmd.extend(['--version', options.version, '--nolib'])
# Build
utils.Print(f'Preparing {app}', quiet=options.quiet)
diff --git a/tools/run_benchmark.py b/tools/run_benchmark.py
index ed34d9b..e239c35 100755
--- a/tools/run_benchmark.py
+++ b/tools/run_benchmark.py
@@ -87,6 +87,10 @@
default=False)
options, args = result.parse_known_args(argv)
options.quiet = not options.verbose
+ # We must download the non-lib distribution when running with a specific
+ # version, since BenchmarkMainEntryRunner is using R8 internals.
+ # TODO(b/346477461): Look into removing this limitation.
+ assert options.version is None or options.nolib
return options, args
