Use .runner_config instead of .config Part 2
am: bc78b86066
Change-Id: I743f859b16bd866f35697091a11c2e6117e9fc56
diff --git a/audio/V2_0/target/AndroidTest.xml b/audio/V2_0/target/AndroidTest.xml
index c14a7b5..0899fad 100644
--- a/audio/V2_0/target/AndroidTest.xml
+++ b/audio/V2_0/target/AndroidTest.xml
@@ -31,6 +31,7 @@
<option name="exclude-coverage-path" value="hardware/qcom/audio/post_proc" />
<option name="exclude-coverage-path" value="hardware/qcom/audio/visualizer" />
<option name="exclude-coverage-path" value="hardware/qcom/audio/voice_processing/" />
+ <option name="precondition-lshal" value="android.hardware.audio@2.0"/>
<option name="test-timeout" value="30m"/>
<option name="gtest-batch-mode" value="true"/>
</test>
diff --git a/audio/V2_0/target_profiling/AndroidTest.xml b/audio/V2_0/target_profiling/AndroidTest.xml
index c1ee846..a2f9e50 100644
--- a/audio/V2_0/target_profiling/AndroidTest.xml
+++ b/audio/V2_0/target_profiling/AndroidTest.xml
@@ -37,6 +37,7 @@
<option name="exclude-coverage-path" value="hardware/qcom/audio/post_proc" />
<option name="exclude-coverage-path" value="hardware/qcom/audio/visualizer" />
<option name="exclude-coverage-path" value="hardware/qcom/audio/voice_processing/" />
+ <option name="precondition-lshal" value="android.hardware.audio@2.0"/>
<option name="test-timeout" value="60m"/>
<option name="gtest-batch-mode" value="true"/>
</test>
diff --git a/authsecret/V1_0/target/AndroidTest.xml b/authsecret/V1_0/target/AndroidTest.xml
index 94bc442..80f991a 100644
--- a/authsecret/V1_0/target/AndroidTest.xml
+++ b/authsecret/V1_0/target/AndroidTest.xml
@@ -27,6 +27,7 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.authsecret@1.0"/>
<option name="test-timeout" value="1m"/>
</test>
</configuration>
diff --git a/drm/V1_1/target/AndroidTest.xml b/drm/V1_1/target/AndroidTest.xml
index e35980d..9092108 100644
--- a/drm/V1_1/target/AndroidTest.xml
+++ b/drm/V1_1/target/AndroidTest.xml
@@ -27,6 +27,7 @@
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalDrmV1_1TargetTest/VtsHalDrmV1_1TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalDrmV1_1TargetTest/VtsHalDrmV1_1TargetTest"/>
<option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="precondition-lshal" value="android.hardware.drm@1.1"/>
<option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/drm/V1_1/target_profiling/AndroidTest.xml b/drm/V1_1/target_profiling/AndroidTest.xml
index dda5a49..4094859 100644
--- a/drm/V1_1/target_profiling/AndroidTest.xml
+++ b/drm/V1_1/target_profiling/AndroidTest.xml
@@ -31,6 +31,7 @@
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalDrmV1_1TargetTest/VtsHalDrmV1_1TargetTest"/>
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="enable-profiling" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.drm@1.1"/>
<option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/gnss/V1_1/target/AndroidTest.xml b/gnss/V1_1/target/AndroidTest.xml
index 3dd5a1a..959fb27 100644
--- a/gnss/V1_1/target/AndroidTest.xml
+++ b/gnss/V1_1/target/AndroidTest.xml
@@ -27,6 +27,7 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.gnss@1.1"/>
<option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/graphics/composer/V2_2/target/AndroidTest.xml b/graphics/composer/V2_2/target/AndroidTest.xml
index 82d9d06..f273af3 100644
--- a/graphics/composer/V2_2/target/AndroidTest.xml
+++ b/graphics/composer/V2_2/target/AndroidTest.xml
@@ -27,6 +27,7 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.graphics.composer@2.2"/>
<option name="test-timeout" value="1m"/>
</test>
</configuration>
diff --git a/graphics/mapper/V2_1/target/AndroidTest.xml b/graphics/mapper/V2_1/target/AndroidTest.xml
index fe08332..2e9d11e 100644
--- a/graphics/mapper/V2_1/target/AndroidTest.xml
+++ b/graphics/mapper/V2_1/target/AndroidTest.xml
@@ -29,6 +29,7 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.graphics.mapper@2.1"/>
<option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/graphics/mapper/V2_1/target_profiling/AndroidTest.xml b/graphics/mapper/V2_1/target_profiling/AndroidTest.xml
index c192993..016c91c 100644
--- a/graphics/mapper/V2_1/target_profiling/AndroidTest.xml
+++ b/graphics/mapper/V2_1/target_profiling/AndroidTest.xml
@@ -37,6 +37,7 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="enable-profiling" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.graphics.mapper@2.1"/>
<option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/health/V2_0/target/AndroidTest.xml b/health/V2_0/target/AndroidTest.xml
index c4b8d5f..da96a9e 100644
--- a/health/V2_0/target/AndroidTest.xml
+++ b/health/V2_0/target/AndroidTest.xml
@@ -27,6 +27,7 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.health@2.0"/>
<option name="test-timeout" value="1m"/>
</test>
</configuration>
diff --git a/power/V1_2/target/AndroidTest.xml b/power/V1_2/target/AndroidTest.xml
index fe17d0f..4ec3342 100644
--- a/power/V1_2/target/AndroidTest.xml
+++ b/power/V1_2/target/AndroidTest.xml
@@ -27,6 +27,7 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.power@1.2"/>
<option name="test-timeout" value="1m"/>
</test>
</configuration>
diff --git a/soundtrigger/V2_1/target/AndroidTest.xml b/soundtrigger/V2_1/target/AndroidTest.xml
index 80413a9..0b4e682 100644
--- a/soundtrigger/V2_1/target/AndroidTest.xml
+++ b/soundtrigger/V2_1/target/AndroidTest.xml
@@ -27,11 +27,7 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
- <option name="exclude-coverage-path" value="hardware/interfaces/audio/" />
- <option name="exclude-coverage-path" value="hardware/libhardware/" />
- <option name="exclude-coverage-path" value="hardware/qcom/audio/post_proc/" />
- <option name="exclude-coverage-path" value="frameworks/av/media/libnbaio/" />
- <option name="exclude-coverage-path" value="system/media/audio_utils/" />
+ <option name="precondition-lshal" value="android.hardware.soundtrigger@2.1"/>
<option name="precondition-file-path-prefix" value="/*/lib/hw/sound_trigger.primary.*" />
<option name="test-timeout" value="5m"/>
</test>
diff --git a/soundtrigger/V2_1/target_profiling/AndroidTest.xml b/soundtrigger/V2_1/target_profiling/AndroidTest.xml
index 7d1687f..e01d354 100644
--- a/soundtrigger/V2_1/target_profiling/AndroidTest.xml
+++ b/soundtrigger/V2_1/target_profiling/AndroidTest.xml
@@ -35,11 +35,7 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="enable-profiling" value="true"/>
- <option name="exclude-coverage-path" value="hardware/interfaces/audio/" />
- <option name="exclude-coverage-path" value="hardware/libhardware/" />
- <option name="exclude-coverage-path" value="hardware/qcom/audio/post_proc/" />
- <option name="exclude-coverage-path" value="frameworks/av/media/libnbaio/" />
- <option name="exclude-coverage-path" value="system/media/audio_utils/" />
+ <option name="precondition-lshal" value="android.hardware.soundtrigger@2.1"/>
<option name="precondition-file-path-prefix" value="/*/lib/hw/sound_trigger.primary.*" />
<option name="test-timeout" value="5m"/>
</test>
diff --git a/thermal/V1_0/target_replay/AndroidTest.xml b/thermal/V1_0/target_replay/AndroidTest.xml
index e30d598..6a716dc 100644
--- a/thermal/V1_0/target_replay/AndroidTest.xml
+++ b/thermal/V1_0/target_replay/AndroidTest.xml
@@ -29,6 +29,10 @@
<option name="binary-test-type" value="hal_hidl_replay_test"/>
<option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/thermal/V1_0/android.hardware.thermal_1.0_414823138144.vts.trace"/>
<option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/thermal/V1_0/android.hardware.thermal_1.0_42653587163.vts.trace"/>
+<<<<<<< HEAD
+ <option name="precondition-lshal" value="android.hardware.thermal@1.0"/>
+=======
+>>>>>>> 0b407a15... Remove precondition-lshal in AT.xml
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="5m"/>
</test>
diff --git a/wifi/supplicant/V1_1/target/AndroidTest.xml b/wifi/supplicant/V1_1/target/AndroidTest.xml
index a3be44d..9f07e87 100644
--- a/wifi/supplicant/V1_1/target/AndroidTest.xml
+++ b/wifi/supplicant/V1_1/target/AndroidTest.xml
@@ -27,6 +27,7 @@
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.wifi.supplicant@1.1"/>
<option name="test-timeout" value="30m"/>
</test>
</configuration>
diff --git a/wifi/supplicant/V1_1/target_profiling/AndroidTest.xml b/wifi/supplicant/V1_1/target_profiling/AndroidTest.xml
index 110d46c..5506c8d 100644
--- a/wifi/supplicant/V1_1/target_profiling/AndroidTest.xml
+++ b/wifi/supplicant/V1_1/target_profiling/AndroidTest.xml
@@ -33,6 +33,7 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="enable-profiling" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.wifi.supplicant@1.1"/>
<option name="test-timeout" value="30m"/>
</test>
</configuration>