Snap for 4736748 from f9b4ed978a24aa01cb4ed9f41507d035e14260a9 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release

Change-Id: Icc1e4d07f92fd5673cb6b590245271419e077ae6

18 files changed, 12 insertions, 12 deletions

diff --git a/hwbinder_benchmark/binderize/AndroidTest.xml b/hwbinder_benchmark/binderize/AndroidTest.xml
index d75004d..7903c7b 100644
--- a/hwbinder_benchmark/binderize/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizePerformanceTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark/HwBinderPerformanceTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark/binderize/HwBinderBinderizePerformanceTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark/binderize/HwBinderBinderizePerformanceTest.runner_conf" />
         <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/hwbinder_benchmark/binderize/HwBinderBinderizePerformanceTest.config b/hwbinder_benchmark/binderize/HwBinderBinderizePerformanceTest.runner_conf
index fc792a7..fc792a7 100644
--- a/hwbinder_benchmark/binderize/HwBinderBinderizePerformanceTest.config
+++ b/hwbinder_benchmark/binderize/HwBinderBinderizePerformanceTest.runner_conf
diff --git a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
index 5cfd9e8..6c99360 100644
--- a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizePerformanceSystraceTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark/HwBinderPerformanceTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark/binderize/HwBinderBinderizePerformanceTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark/binderize/HwBinderBinderizePerformanceTest.runner_conf" />
         <option name="enable-systrace" value="true" />
         <option name="test-timeout" value="5m"/>
     </test>
diff --git a/hwbinder_benchmark/passthrough/AndroidTest.xml b/hwbinder_benchmark/passthrough/AndroidTest.xml
index 5f414e7..cd0f91e 100644
--- a/hwbinder_benchmark/passthrough/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughPerformanceTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark/HwBinderPerformanceTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark/passthrough/HwBinderPassthroughPerformanceTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark/passthrough/HwBinderPassthroughPerformanceTest.runner_conf" />
         <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/hwbinder_benchmark/passthrough/HwBinderPassthroughPerformanceTest.config b/hwbinder_benchmark/passthrough/HwBinderPassthroughPerformanceTest.runner_conf
index 54d9875..54d9875 100644
--- a/hwbinder_benchmark/passthrough/HwBinderPassthroughPerformanceTest.config
+++ b/hwbinder_benchmark/passthrough/HwBinderPassthroughPerformanceTest.runner_conf
diff --git a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
index 74841e3..cc0e1b0 100644
--- a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughPerformanceSystraceTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark/HwBinderPerformanceTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark/passthrough/HwBinderPassthroughPerformanceTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_benchmark/passthrough/HwBinderPassthroughPerformanceTest.runner_conf" />
         <option name="enable-systrace" value="true" />
         <option name="test-timeout" value="5m"/>
     </test>
diff --git a/hwbinder_latency_test/binderize/AndroidTest.xml b/hwbinder_latency_test/binderize/AndroidTest.xml
index b63a2d4..ac998bc 100644
--- a/hwbinder_latency_test/binderize/AndroidTest.xml
+++ b/hwbinder_latency_test/binderize/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizeLatencyTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_latency_test/HwBinderLatencyTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_latency_test/binderize/HwBinderBinderizeLatencyTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_latency_test/binderize/HwBinderBinderizeLatencyTest.runner_conf" />
         <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/hwbinder_latency_test/binderize/HwBinderBinderizeLatencyTest.config b/hwbinder_latency_test/binderize/HwBinderBinderizeLatencyTest.runner_conf
index fc792a7..fc792a7 100644
--- a/hwbinder_latency_test/binderize/HwBinderBinderizeLatencyTest.config
+++ b/hwbinder_latency_test/binderize/HwBinderBinderizeLatencyTest.runner_conf
diff --git a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
index 3fa6163..f8aeec5 100644
--- a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizeLatencySystraceTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_latency_test/HwBinderLatencyTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_latency_test/binderize/HwBinderBinderizeLatencyTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_latency_test/binderize/HwBinderBinderizeLatencyTest.runner_conf" />
         <option name="enable-systrace" value="true" />
         <option name="test-timeout" value="5m"/>
     </test>
diff --git a/hwbinder_latency_test/passthrough/AndroidTest.xml b/hwbinder_latency_test/passthrough/AndroidTest.xml
index 7ecc4eb..a4430ab 100644
--- a/hwbinder_latency_test/passthrough/AndroidTest.xml
+++ b/hwbinder_latency_test/passthrough/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughLatencyTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_latency_test/HwBinderLatencyTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_latency_test/passthrough/HwBinderPassthroughLatencyTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_latency_test/passthrough/HwBinderPassthroughLatencyTest.runner_conf" />
         <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/hwbinder_latency_test/passthrough/HwBinderPassthroughLatencyTest.config b/hwbinder_latency_test/passthrough/HwBinderPassthroughLatencyTest.runner_conf
index 54d9875..54d9875 100644
--- a/hwbinder_latency_test/passthrough/HwBinderPassthroughLatencyTest.config
+++ b/hwbinder_latency_test/passthrough/HwBinderPassthroughLatencyTest.runner_conf
diff --git a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
index 56244e5..ed79b04 100644
--- a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughLatencySystraceTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_latency_test/HwBinderLatencyTest" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_latency_test/passthrough/HwBinderPassthroughLatencyTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_latency_test/passthrough/HwBinderPassthroughLatencyTest.runner_conf" />
         <option name="enable-systrace" value="true" />
         <option name="test-timeout" value="5m"/>
     </test>
diff --git a/hwbinder_throughput_test/binderize/AndroidTest.xml b/hwbinder_throughput_test/binderize/AndroidTest.xml
index 2bfbecd..b1e1cd9 100644
--- a/hwbinder_throughput_test/binderize/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizeThroughputTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_throughput_test/HwBinderThroughputBenchmark" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/binderize/HwBinderBinderizeThroughputTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/binderize/HwBinderBinderizeThroughputTest.runner_conf" />
         <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/hwbinder_throughput_test/binderize/HwBinderBinderizeThroughputTest.config b/hwbinder_throughput_test/binderize/HwBinderBinderizeThroughputTest.runner_conf
index fc792a7..fc792a7 100644
--- a/hwbinder_throughput_test/binderize/HwBinderBinderizeThroughputTest.config
+++ b/hwbinder_throughput_test/binderize/HwBinderBinderizeThroughputTest.runner_conf
diff --git a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
index 265dcb6..3e6782e 100644
--- a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderBinderizeThroughputSystraceTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_throughput_test/HwBinderThroughputBenchmark" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/binderize/HwBinderBinderizeThroughputTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/binderize/HwBinderBinderizeThroughputTest.runner_conf" />
         <option name="enable-systrace" value="true" />
         <option name="test-timeout" value="5m"/>
     </test>
diff --git a/hwbinder_throughput_test/passthrough/AndroidTest.xml b/hwbinder_throughput_test/passthrough/AndroidTest.xml
index bbaab79..8d606c5 100644
--- a/hwbinder_throughput_test/passthrough/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughThroughputTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_throughput_test/HwBinderThroughputBenchmark" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.runner_conf" />
         <option name="test-timeout" value="5m"/>
     </test>
 </configuration>
diff --git a/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.config b/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.runner_conf
index 54d9875..54d9875 100644
--- a/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.config
+++ b/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.runner_conf
diff --git a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
index 5afa1e3..fd1c5db 100644
--- a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
@@ -27,7 +27,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="HwBinderPassthroughThroughputSystraceTest" />
         <option name="test-case-path" value="vts/testcases/performance/hwbinder_throughput_test/HwBinderThroughputBenchmark" />
-        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.config" />
+        <option name="test-config-path" value="vts/testcases/performance/hwbinder_throughput_test/passthrough/HwBinderPassthroughThroughputTest.runner_conf" />
         <option name="enable-systrace" value="true" />
         <option name="test-timeout" value="5m"/>
     </test>