Merge "Ensure Shipping FCM Version fulfills launch requirements"
diff --git a/camera/provider/V2_4/target/AndroidTest.xml b/camera/provider/V2_4/target/AndroidTest.xml
index 1029410..a593731 100644
--- a/camera/provider/V2_4/target/AndroidTest.xml
+++ b/camera/provider/V2_4/target/AndroidTest.xml
@@ -25,6 +25,12 @@
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest"/>
<option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="exclude-coverage-path" value="hardware/qcom/camera/msm8998/QCamera2/HAL" />
+ <option name="exclude-coverage-path" value="hardware/interfaces/graphics/mapper/2.0" />
+ <option name="exclude-coverage-path" value="hardware/interfaces/configstore/utils" />
+ <option name="exclude-coverage-path" value="hardware/interfaces/sensors" />
+ <option name="exclude-coverage-path" value="hardware/qcom/display/msm8998" />
+ <option name="exclude-coverage-path" value="vendor/qcom/msm8998/proprietary/proprietary/qmi-framework" />
<option name="precondition-lshal" value="android.hardware.camera.provider@2.4"/>
<option name="test-timeout" value="15m"/>
</test>
diff --git a/nfc/V1_0/target/AndroidTest.xml b/nfc/V1_0/target/AndroidTest.xml
index d3aff14..ac1d20d 100644
--- a/nfc/V1_0/target/AndroidTest.xml
+++ b/nfc/V1_0/target/AndroidTest.xml
@@ -28,6 +28,8 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
+ <option name="exclude-coverage-path" value="frameworks/av/media"/>
+ <option name="exclude-coverage-path" value="frameworks/rs"/>
<option name="test-timeout" value="15m"/>
<option name="runtime-hint" value="5m"/>
</test>
diff --git a/radio/V1_0/target/sap/AndroidTest.xml b/radio/V1_0/target/sap/AndroidTest.xml
index 107f854..6bf8b6a 100644
--- a/radio/V1_0/target/sap/AndroidTest.xml
+++ b/radio/V1_0/target/sap/AndroidTest.xml
@@ -19,7 +19,7 @@
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HalHidlTargetTest.push"/>
</target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+ <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsHalSapV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalSapV1_0TargetTest/VtsHalSapV1_0TargetTest"/>
diff --git a/renderscript/V1_0/target/AndroidTest.xml b/renderscript/V1_0/target/AndroidTest.xml
index f1c99ad..eb2cc51 100644
--- a/renderscript/V1_0/target/AndroidTest.xml
+++ b/renderscript/V1_0/target/AndroidTest.xml
@@ -28,6 +28,7 @@
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRenderscriptV1_0TargetTest/VtsHalRenderscriptV1_0TargetTest"/>
<option name="binary-test-type" value="hal_hidl_gtest"/>
<option name="precondition-lshal" value="android.hardware.renderscript@1.0"/>
+ <option name="exclude-coverage-path" value="frameworks/av/media" />
<option name="test-timeout" value="5m"/>
</test>
</configuration>
