Merge "Add device_aconfig_declarations target" into main
diff --git a/core/instrumentation_test_config_template.xml b/core/instrumentation_test_config_template.xml
index 9dfc001..379126c 100644
--- a/core/instrumentation_test_config_template.xml
+++ b/core/instrumentation_test_config_template.xml
@@ -24,7 +24,7 @@
</target_preparer>
<test class="com.android.tradefed.testtype.{TEST_TYPE}" >
- <option name="package" value="{PACKAGE}" />
+ {EXTRA_TEST_RUNNER_CONFIGS}<option name="package" value="{PACKAGE}" />
<option name="runner" value="{RUNNER}" />
</test>
</configuration>
diff --git a/tools/perf/benchmarks b/tools/perf/benchmarks
index acc53bb..61bf888 100755
--- a/tools/perf/benchmarks
+++ b/tools/perf/benchmarks
@@ -302,7 +302,7 @@
self._dist(utils.get_dist_dir())
else:
# Postroll builds
- for i in range(benchmark.preroll):
+ for i in range(benchmark.postroll):
ns = self._run_build(lunch, benchmark_log_dir.joinpath(f"post_{i}"),
benchmark.modules)
report.postroll_duration_ns.append(ns)