Snap for 6300905 from 4e79e937dfa6fd78808db36f5561729313065ba2 to qt-d4-release
Change-Id: Ibbcdefb0fdcf1f07c3eaf482e62863aa2bf7c215
diff --git a/res/config/template/atest_local_min.xml b/res/config/template/atest_local_min.xml
new file mode 100644
index 0000000..3cde23f
--- /dev/null
+++ b/res/config/template/atest_local_min.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Common configuration for atest's local runs with minimum overhead. -->
+<configuration description="Common configuration for atest's local runs with minimum overhead">
+ <log_saver class="com.android.tradefed.result.ATestFileSystemLogSaver" />
+ <include name="template/local_min_base" />
+</configuration>
diff --git a/res/config/template/local_min.xml b/res/config/template/local_min.xml
index 3a5609c..9ad2534 100644
--- a/res/config/template/local_min.xml
+++ b/res/config/template/local_min.xml
@@ -13,24 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- Common base configuration for local runs with minimum overhead. -->
-<configuration description="Common base configuration for local runs with minimum overhead">
- <build_provider class="com.android.tradefed.build.BootstrapBuildProvider" />
- <target_preparer class="com.android.tradefed.targetprep.PreloadedClassesPreparer">
- <option name="disable" value="true" />
- </target_preparer>
-
- <template-include name="preparers" default="empty" />
-
- <template-include name="test" default="empty" />
-
- <logger class="com.android.tradefed.log.FileLogger">
- <option name="log-level" value="VERBOSE" />
- <option name="log-level-display" value="VERBOSE" />
- </logger>
+<!-- Common configuration for local runs with minimum overhead. -->
+<configuration description="Common configuration for local runs with minimum overhead">
<log_saver class="com.android.tradefed.result.FileSystemLogSaver" />
- <result_reporter class="com.android.tradefed.result.ConsoleResultReporter" />
- <result_reporter class="com.android.tradefed.result.suite.SuiteResultReporter" />
- <template-include name="reporters" default="empty" />
- <template-include name="metrics_collector" default="empty" />
+ <include name="template/local_min_base"/>
</configuration>
diff --git a/res/config/template/local_min_base.xml b/res/config/template/local_min_base.xml
new file mode 100644
index 0000000..f4f33e1
--- /dev/null
+++ b/res/config/template/local_min_base.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Common base configuration for local runs with minimum overhead. -->
+<configuration description="Common base configuration for local runs with minimum overhead">
+ <build_provider class="com.android.tradefed.build.BootstrapBuildProvider" />
+
+ <template-include name="preparers" default="empty" />
+
+ <template-include name="test" default="empty" />
+
+ <logger class="com.android.tradefed.log.FileLogger">
+ <option name="log-level" value="VERBOSE" />
+ <option name="log-level-display" value="VERBOSE" />
+ </logger>
+ <result_reporter class="com.android.tradefed.result.ConsoleResultReporter" />
+ <result_reporter class="com.android.tradefed.result.suite.SuiteResultReporter" />
+ <template-include name="reporters" default="empty" />
+ <template-include name="metrics_collector" default="empty" />
+</configuration>
