Merge "audio: increase test-timeout to 60 mins for test VtsHalAudioV5_0Target"
diff --git a/audio/effect/V2_0/target/AndroidTest.xml b/audio/effect/V2_0/target/AndroidTest.xml
index 0506ed0..95cc5fc 100644
--- a/audio/effect/V2_0/target/AndroidTest.xml
+++ b/audio/effect/V2_0/target/AndroidTest.xml
@@ -24,7 +24,7 @@
<option name="test-module-name" value="VtsHalAudioEffectV2_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalAudioEffectV2_0TargetTest/VtsHalAudioEffectV2_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalAudioEffectV2_0TargetTest/VtsHalAudioEffectV2_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="exclude-coverage-path" value="frameworks/av" />
diff --git a/audio/effect/V4_0/target/AndroidTest.xml b/audio/effect/V4_0/target/AndroidTest.xml
index 5c40462..c6afd18 100644
--- a/audio/effect/V4_0/target/AndroidTest.xml
+++ b/audio/effect/V4_0/target/AndroidTest.xml
@@ -25,7 +25,7 @@
<option name="test-module-name" value="VtsHalAudioEffectV4_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalAudioEffectV4_0TargetTest/VtsHalAudioEffectV4_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalAudioEffectV4_0TargetTest/VtsHalAudioEffectV4_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="exclude-coverage-path" value="frameworks/av" />
diff --git a/audio/effect/V5_0/target/AndroidTest.xml b/audio/effect/V5_0/target/AndroidTest.xml
index 7ee760a..30b9b8e 100644
--- a/audio/effect/V5_0/target/AndroidTest.xml
+++ b/audio/effect/V5_0/target/AndroidTest.xml
@@ -25,7 +25,7 @@
<option name="test-module-name" value="VtsHalAudioEffectV5_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalAudioEffectV5_0TargetTest/VtsHalAudioEffectV5_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalAudioEffectV5_0TargetTest/VtsHalAudioEffectV5_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="exclude-coverage-path" value="frameworks/av" />
diff --git a/biometrics/face/V1_0/target/AndroidTest.xml b/biometrics/face/V1_0/target/AndroidTest.xml
index 5f6a0cd..062834c 100644
--- a/biometrics/face/V1_0/target/AndroidTest.xml
+++ b/biometrics/face/V1_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalBiometricsFaceV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalBiometricsFaceV1_0TargetTest/VtsHalBiometricsFaceV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalBiometricsFaceV1_0TargetTest/VtsHalBiometricsFaceV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="false"/>
<option name="test-timeout" value="15m"/>
</test>
diff --git a/broadcastradio/V2_0/target/AndroidTest.xml b/broadcastradio/V2_0/target/AndroidTest.xml
index 59ebd08..e457f05 100644
--- a/broadcastradio/V2_0/target/AndroidTest.xml
+++ b/broadcastradio/V2_0/target/AndroidTest.xml
@@ -25,7 +25,7 @@
<option name="test-module-name" value="VtsHalBroadcastradioV2_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalBroadcastradioV2_0TargetTest/VtsHalBroadcastradioV2_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalBroadcastradioV2_0TargetTest/VtsHalBroadcastradioV2_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
</test>
diff --git a/contexthub/V1_0/target/AndroidTest.xml b/contexthub/V1_0/target/AndroidTest.xml
index 8eee8dc..13ef668 100644
--- a/contexthub/V1_0/target/AndroidTest.xml
+++ b/contexthub/V1_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalContexthubV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalContexthubV1_0TargetTest/VtsHalContexthubV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalContexthubV1_0TargetTest/VtsHalContexthubV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
</test>
diff --git a/gatekeeper/V1_0/target/AndroidTest.xml b/gatekeeper/V1_0/target/AndroidTest.xml
index f04ed70..0ed2147 100644
--- a/gatekeeper/V1_0/target/AndroidTest.xml
+++ b/gatekeeper/V1_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalGatekeeperV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalGatekeeperV1_0TargetTest/VtsHalGatekeeperV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalGatekeeperV1_0TargetTest/VtsHalGatekeeperV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
</test>
diff --git a/graphics/mapper/V2_0/target/AndroidTest.xml b/graphics/mapper/V2_0/target/AndroidTest.xml
index bb8d361..00dee20 100644
--- a/graphics/mapper/V2_0/target/AndroidTest.xml
+++ b/graphics/mapper/V2_0/target/AndroidTest.xml
@@ -25,7 +25,7 @@
<option name="binary-test-working-directory" value="_64bit::/data/nativetest64/" />
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalGraphicsMapperV2_0TargetTest/VtsHalGraphicsMapperV2_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalGraphicsMapperV2_0TargetTest/VtsHalGraphicsMapperV2_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="5m"/>
</test>
diff --git a/graphics/mapper/V2_1/target/AndroidTest.xml b/graphics/mapper/V2_1/target/AndroidTest.xml
index d212914..b124b73 100644
--- a/graphics/mapper/V2_1/target/AndroidTest.xml
+++ b/graphics/mapper/V2_1/target/AndroidTest.xml
@@ -26,7 +26,7 @@
<option name="binary-test-working-directory" value="_64bit::/data/nativetest64/" />
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalGraphicsMapperV2_1TargetTest/VtsHalGraphicsMapperV2_1TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalGraphicsMapperV2_1TargetTest/VtsHalGraphicsMapperV2_1TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="5m"/>
</test>
diff --git a/graphics/mapper/V3_0/target/AndroidTest.xml b/graphics/mapper/V3_0/target/AndroidTest.xml
index 8f414a1..848d04f 100644
--- a/graphics/mapper/V3_0/target/AndroidTest.xml
+++ b/graphics/mapper/V3_0/target/AndroidTest.xml
@@ -25,7 +25,7 @@
<option name="binary-test-working-directory" value="_64bit::/data/nativetest64/" />
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalGraphicsMapperV3_0TargetTest/VtsHalGraphicsMapperV3_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalGraphicsMapperV3_0TargetTest/VtsHalGraphicsMapperV3_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="5m"/>
</test>
diff --git a/health/V2_0/target/AndroidTest.xml b/health/V2_0/target/AndroidTest.xml
index e353caa..bffe376 100644
--- a/health/V2_0/target/AndroidTest.xml
+++ b/health/V2_0/target/AndroidTest.xml
@@ -24,7 +24,7 @@
<option name="test-module-name" value="VtsHalHealthV2_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalHealthV2_0TargetTest/VtsHalHealthV2_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalHealthV2_0TargetTest/VtsHalHealthV2_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="1m"/>
</test>
diff --git a/keymaster/V3_0/target/AndroidTest.xml b/keymaster/V3_0/target/AndroidTest.xml
index 9a2de0d..da072a8 100644
--- a/keymaster/V3_0/target/AndroidTest.xml
+++ b/keymaster/V3_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalKeymasterV3_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalKeymasterV3_0TargetTest/VtsHalKeymasterV3_0TargetTest" />
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalKeymasterV3_0TargetTest/VtsHalKeymasterV3_0TargetTest" />
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/keymaster/V4_0/target/AndroidTest.xml b/keymaster/V4_0/target/AndroidTest.xml
index bc26d87..b2ea33b 100644
--- a/keymaster/V4_0/target/AndroidTest.xml
+++ b/keymaster/V4_0/target/AndroidTest.xml
@@ -24,7 +24,7 @@
<option name="test-module-name" value="VtsHalKeymasterV4_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalKeymasterV4_0TargetTest/VtsHalKeymasterV4_0TargetTest" />
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalKeymasterV4_0TargetTest/VtsHalKeymasterV4_0TargetTest" />
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="test-timeout" value="15m"/>
</test>
</configuration>
diff --git a/media/c2/V1_0/host/AndroidTest.xml b/media/c2/V1_0/host/AndroidTest.xml
index d1b75e2..d14f061 100644
--- a/media/c2/V1_0/host/AndroidTest.xml
+++ b/media/c2/V1_0/host/AndroidTest.xml
@@ -71,64 +71,64 @@
<option name="push" value="DATA/lib/android.hardware.media.c2@1.0-vts.driver.so->/data/local/tmp/32/android.hardware.media.c2@1.0-vts.driver.so"/>
<option name="push" value="DATA/lib64/android.hardware.media.c2@1.0-vts.driver.so->/data/local/tmp/64/android.hardware.media.c2@1.0-vts.driver.so"/>
- <option name="push" value="DATA/media/c2/res/bbb_352x288_420p_30fps_32frames.yuv->/sdcard/media/bbb_352x288_420p_30fps_32frames.yuv"/>
- <option name="push" value="DATA/media/c2/res/bbb_aac_stereo_128kbps_48000hz.aac->/sdcard/media/bbb_aac_stereo_128kbps_48000hz.aac"/>
- <option name="push" value="DATA/media/c2/res/bbb_aac_stereo_128kbps_48000hz.info->/sdcard/media/bbb_aac_stereo_128kbps_48000hz.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_aac_stereo_128kbps_48000hz_multi_frame.info->/sdcard/media/bbb_aac_stereo_128kbps_48000hz_multi_frame.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_amrwb_1ch_14kbps_16000hz.amrwb->/sdcard/media/bbb_amrwb_1ch_14kbps_16000hz.amrwb"/>
- <option name="push" value="DATA/media/c2/res/bbb_amrwb_1ch_14kbps_16000hz.info->/sdcard/media/bbb_amrwb_1ch_14kbps_16000hz.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_amrwb_1ch_14kbps_16000hz_multi_frame.info->/sdcard/media/bbb_amrwb_1ch_14kbps_16000hz_multi_frame.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_av1_176_144.av1->/sdcard/media/bbb_av1_176_144.av1"/>
- <option name="push" value="DATA/media/c2/res/bbb_av1_176_144.info->/sdcard/media/bbb_av1_176_144.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_av1_640_360.av1->/sdcard/media/bbb_av1_640_360.av1"/>
- <option name="push" value="DATA/media/c2/res/bbb_av1_640_360.info->/sdcard/media/bbb_av1_640_360.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_avc_176x144_300kbps_60fps.h264->/sdcard/media/bbb_avc_176x144_300kbps_60fps.h264"/>
- <option name="push" value="DATA/media/c2/res/bbb_avc_176x144_300kbps_60fps.info->/sdcard/media/bbb_avc_176x144_300kbps_60fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_avc_640x360_768kbps_30fps.h264->/sdcard/media/bbb_avc_640x360_768kbps_30fps.h264"/>
- <option name="push" value="DATA/media/c2/res/bbb_avc_640x360_768kbps_30fps.info->/sdcard/media/bbb_avc_640x360_768kbps_30fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_flac_stereo_680kbps_48000hz.flac->/sdcard/media/bbb_flac_stereo_680kbps_48000hz.flac"/>
- <option name="push" value="DATA/media/c2/res/bbb_flac_stereo_680kbps_48000hz.info->/sdcard/media/bbb_flac_stereo_680kbps_48000hz.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_g711alaw_1ch_8khz.info->/sdcard/media/bbb_g711alaw_1ch_8khz.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_g711alaw_1ch_8khz.raw->/sdcard/media/bbb_g711alaw_1ch_8khz.raw"/>
- <option name="push" value="DATA/media/c2/res/bbb_g711mulaw_1ch_8khz.info->/sdcard/media/bbb_g711mulaw_1ch_8khz.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_g711mulaw_1ch_8khz.raw->/sdcard/media/bbb_g711mulaw_1ch_8khz.raw"/>
- <option name="push" value="DATA/media/c2/res/bbb_gsm_1ch_8khz_13kbps.info->/sdcard/media/bbb_gsm_1ch_8khz_13kbps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_gsm_1ch_8khz_13kbps.raw->/sdcard/media/bbb_gsm_1ch_8khz_13kbps.raw"/>
- <option name="push" value="DATA/media/c2/res/bbb_h263_352x288_300kbps_12fps.h263->/sdcard/media/bbb_h263_352x288_300kbps_12fps.h263"/>
- <option name="push" value="DATA/media/c2/res/bbb_h263_352x288_300kbps_12fps.info->/sdcard/media/bbb_h263_352x288_300kbps_12fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_hevc_176x144_176kbps_60fps.hevc->/sdcard/media/bbb_hevc_176x144_176kbps_60fps.hevc"/>
- <option name="push" value="DATA/media/c2/res/bbb_hevc_176x144_176kbps_60fps.info->/sdcard/media/bbb_hevc_176x144_176kbps_60fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_hevc_640x360_1600kbps_30fps.hevc->/sdcard/media/bbb_hevc_640x360_1600kbps_30fps.hevc"/>
- <option name="push" value="DATA/media/c2/res/bbb_hevc_640x360_1600kbps_30fps.info->/sdcard/media/bbb_hevc_640x360_1600kbps_30fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_mp3_stereo_192kbps_48000hz.info->/sdcard/media/bbb_mp3_stereo_192kbps_48000hz.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_mp3_stereo_192kbps_48000hz.mp3->/sdcard/media/bbb_mp3_stereo_192kbps_48000hz.mp3"/>
- <option name="push" value="DATA/media/c2/res/bbb_mp3_stereo_192kbps_48000hz_multi_frame.info->/sdcard/media/bbb_mp3_stereo_192kbps_48000hz_multi_frame.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_mpeg2_176x144_105kbps_25fps.info->/sdcard/media/bbb_mpeg2_176x144_105kbps_25fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_mpeg2_176x144_105kbps_25fps.m2v->/sdcard/media/bbb_mpeg2_176x144_105kbps_25fps.m2v"/>
- <option name="push" value="DATA/media/c2/res/bbb_mpeg2_352x288_1mbps_60fps.info->/sdcard/media/bbb_mpeg2_352x288_1mbps_60fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_mpeg2_352x288_1mbps_60fps.m2v->/sdcard/media/bbb_mpeg2_352x288_1mbps_60fps.m2v"/>
- <option name="push" value="DATA/media/c2/res/bbb_mpeg4_352x288_512kbps_30fps.info->/sdcard/media/bbb_mpeg4_352x288_512kbps_30fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_mpeg4_352x288_512kbps_30fps.m4v->/sdcard/media/bbb_mpeg4_352x288_512kbps_30fps.m4v"/>
- <option name="push" value="DATA/media/c2/res/bbb_opus_stereo_128kbps_48000hz.info->/sdcard/media/bbb_opus_stereo_128kbps_48000hz.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_opus_stereo_128kbps_48000hz.opus->/sdcard/media/bbb_opus_stereo_128kbps_48000hz.opus"/>
- <option name="push" value="DATA/media/c2/res/bbb_raw_1ch_16khz_s16le.raw->/sdcard/media/bbb_raw_1ch_16khz_s16le.raw"/>
- <option name="push" value="DATA/media/c2/res/bbb_raw_1ch_8khz_s16le.raw->/sdcard/media/bbb_raw_1ch_8khz_s16le.raw"/>
- <option name="push" value="DATA/media/c2/res/bbb_raw_1ch_8khz_s32le.info->/sdcard/media/bbb_raw_1ch_8khz_s32le.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_raw_1ch_8khz_s32le.raw->/sdcard/media/bbb_raw_1ch_8khz_s32le.raw"/>
- <option name="push" value="DATA/media/c2/res/bbb_raw_2ch_48khz_s16le.raw->/sdcard/media/bbb_raw_2ch_48khz_s16le.raw"/>
- <option name="push" value="DATA/media/c2/res/bbb_vorbis_stereo_128kbps_48000hz.info->/sdcard/media/bbb_vorbis_stereo_128kbps_48000hz.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_vorbis_stereo_128kbps_48000hz.vorbis->/sdcard/media/bbb_vorbis_stereo_128kbps_48000hz.vorbis"/>
- <option name="push" value="DATA/media/c2/res/bbb_vp8_176x144_240kbps_60fps.info->/sdcard/media/bbb_vp8_176x144_240kbps_60fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_vp8_176x144_240kbps_60fps.vp8->/sdcard/media/bbb_vp8_176x144_240kbps_60fps.vp8"/>
- <option name="push" value="DATA/media/c2/res/bbb_vp8_640x360_2mbps_30fps.info->/sdcard/media/bbb_vp8_640x360_2mbps_30fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_vp8_640x360_2mbps_30fps.vp8->/sdcard/media/bbb_vp8_640x360_2mbps_30fps.vp8"/>
- <option name="push" value="DATA/media/c2/res/bbb_vp9_176x144_285kbps_60fps.info->/sdcard/media/bbb_vp9_176x144_285kbps_60fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_vp9_176x144_285kbps_60fps.vp9->/sdcard/media/bbb_vp9_176x144_285kbps_60fps.vp9"/>
- <option name="push" value="DATA/media/c2/res/bbb_vp9_640x360_1600kbps_30fps.info->/sdcard/media/bbb_vp9_640x360_1600kbps_30fps.info"/>
- <option name="push" value="DATA/media/c2/res/bbb_vp9_640x360_1600kbps_30fps.vp9->/sdcard/media/bbb_vp9_640x360_1600kbps_30fps.vp9"/>
- <option name="push" value="DATA/media/c2/res/sine_amrnb_1ch_12kbps_8000hz.amrnb->/sdcard/media/sine_amrnb_1ch_12kbps_8000hz.amrnb"/>
- <option name="push" value="DATA/media/c2/res/sine_amrnb_1ch_12kbps_8000hz.info->/sdcard/media/sine_amrnb_1ch_12kbps_8000hz.info"/>
- <option name="push" value="DATA/media/c2/res/sine_amrnb_1ch_12kbps_8000hz_multi_frame.info->/sdcard/media/sine_amrnb_1ch_12kbps_8000hz_multi_frame.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_352x288_420p_30fps_32frames.yuv->/data/local/tmp/media/bbb_352x288_420p_30fps_32frames.yuv"/>
+ <option name="push" value="DATA/media/c2/res/bbb_aac_stereo_128kbps_48000hz.aac->/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.aac"/>
+ <option name="push" value="DATA/media/c2/res/bbb_aac_stereo_128kbps_48000hz.info->/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_aac_stereo_128kbps_48000hz_multi_frame.info->/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz_multi_frame.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_amrwb_1ch_14kbps_16000hz.amrwb->/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.amrwb"/>
+ <option name="push" value="DATA/media/c2/res/bbb_amrwb_1ch_14kbps_16000hz.info->/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_amrwb_1ch_14kbps_16000hz_multi_frame.info->/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz_multi_frame.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_av1_176_144.av1->/data/local/tmp/media/bbb_av1_176_144.av1"/>
+ <option name="push" value="DATA/media/c2/res/bbb_av1_176_144.info->/data/local/tmp/media/bbb_av1_176_144.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_av1_640_360.av1->/data/local/tmp/media/bbb_av1_640_360.av1"/>
+ <option name="push" value="DATA/media/c2/res/bbb_av1_640_360.info->/data/local/tmp/media/bbb_av1_640_360.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_avc_176x144_300kbps_60fps.h264->/data/local/tmp/media/bbb_avc_176x144_300kbps_60fps.h264"/>
+ <option name="push" value="DATA/media/c2/res/bbb_avc_176x144_300kbps_60fps.info->/data/local/tmp/media/bbb_avc_176x144_300kbps_60fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_avc_640x360_768kbps_30fps.h264->/data/local/tmp/media/bbb_avc_640x360_768kbps_30fps.h264"/>
+ <option name="push" value="DATA/media/c2/res/bbb_avc_640x360_768kbps_30fps.info->/data/local/tmp/media/bbb_avc_640x360_768kbps_30fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_flac_stereo_680kbps_48000hz.flac->/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.flac"/>
+ <option name="push" value="DATA/media/c2/res/bbb_flac_stereo_680kbps_48000hz.info->/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_g711alaw_1ch_8khz.info->/data/local/tmp/media/bbb_g711alaw_1ch_8khz.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_g711alaw_1ch_8khz.raw->/data/local/tmp/media/bbb_g711alaw_1ch_8khz.raw"/>
+ <option name="push" value="DATA/media/c2/res/bbb_g711mulaw_1ch_8khz.info->/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_g711mulaw_1ch_8khz.raw->/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.raw"/>
+ <option name="push" value="DATA/media/c2/res/bbb_gsm_1ch_8khz_13kbps.info->/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_gsm_1ch_8khz_13kbps.raw->/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.raw"/>
+ <option name="push" value="DATA/media/c2/res/bbb_h263_352x288_300kbps_12fps.h263->/data/local/tmp/media/bbb_h263_352x288_300kbps_12fps.h263"/>
+ <option name="push" value="DATA/media/c2/res/bbb_h263_352x288_300kbps_12fps.info->/data/local/tmp/media/bbb_h263_352x288_300kbps_12fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_hevc_176x144_176kbps_60fps.hevc->/data/local/tmp/media/bbb_hevc_176x144_176kbps_60fps.hevc"/>
+ <option name="push" value="DATA/media/c2/res/bbb_hevc_176x144_176kbps_60fps.info->/data/local/tmp/media/bbb_hevc_176x144_176kbps_60fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_hevc_640x360_1600kbps_30fps.hevc->/data/local/tmp/media/bbb_hevc_640x360_1600kbps_30fps.hevc"/>
+ <option name="push" value="DATA/media/c2/res/bbb_hevc_640x360_1600kbps_30fps.info->/data/local/tmp/media/bbb_hevc_640x360_1600kbps_30fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_mp3_stereo_192kbps_48000hz.info->/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_mp3_stereo_192kbps_48000hz.mp3->/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.mp3"/>
+ <option name="push" value="DATA/media/c2/res/bbb_mp3_stereo_192kbps_48000hz_multi_frame.info->/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz_multi_frame.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_mpeg2_176x144_105kbps_25fps.info->/data/local/tmp/media/bbb_mpeg2_176x144_105kbps_25fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_mpeg2_176x144_105kbps_25fps.m2v->/data/local/tmp/media/bbb_mpeg2_176x144_105kbps_25fps.m2v"/>
+ <option name="push" value="DATA/media/c2/res/bbb_mpeg2_352x288_1mbps_60fps.info->/data/local/tmp/media/bbb_mpeg2_352x288_1mbps_60fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_mpeg2_352x288_1mbps_60fps.m2v->/data/local/tmp/media/bbb_mpeg2_352x288_1mbps_60fps.m2v"/>
+ <option name="push" value="DATA/media/c2/res/bbb_mpeg4_352x288_512kbps_30fps.info->/data/local/tmp/media/bbb_mpeg4_352x288_512kbps_30fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_mpeg4_352x288_512kbps_30fps.m4v->/data/local/tmp/media/bbb_mpeg4_352x288_512kbps_30fps.m4v"/>
+ <option name="push" value="DATA/media/c2/res/bbb_opus_stereo_128kbps_48000hz.info->/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_opus_stereo_128kbps_48000hz.opus->/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.opus"/>
+ <option name="push" value="DATA/media/c2/res/bbb_raw_1ch_16khz_s16le.raw->/data/local/tmp/media/bbb_raw_1ch_16khz_s16le.raw"/>
+ <option name="push" value="DATA/media/c2/res/bbb_raw_1ch_8khz_s16le.raw->/data/local/tmp/media/bbb_raw_1ch_8khz_s16le.raw"/>
+ <option name="push" value="DATA/media/c2/res/bbb_raw_1ch_8khz_s32le.info->/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_raw_1ch_8khz_s32le.raw->/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.raw"/>
+ <option name="push" value="DATA/media/c2/res/bbb_raw_2ch_48khz_s16le.raw->/data/local/tmp/media/bbb_raw_2ch_48khz_s16le.raw"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vorbis_stereo_128kbps_48000hz.info->/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vorbis_stereo_128kbps_48000hz.vorbis->/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.vorbis"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vp8_176x144_240kbps_60fps.info->/data/local/tmp/media/bbb_vp8_176x144_240kbps_60fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vp8_176x144_240kbps_60fps.vp8->/data/local/tmp/media/bbb_vp8_176x144_240kbps_60fps.vp8"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vp8_640x360_2mbps_30fps.info->/data/local/tmp/media/bbb_vp8_640x360_2mbps_30fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vp8_640x360_2mbps_30fps.vp8->/data/local/tmp/media/bbb_vp8_640x360_2mbps_30fps.vp8"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vp9_176x144_285kbps_60fps.info->/data/local/tmp/media/bbb_vp9_176x144_285kbps_60fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vp9_176x144_285kbps_60fps.vp9->/data/local/tmp/media/bbb_vp9_176x144_285kbps_60fps.vp9"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vp9_640x360_1600kbps_30fps.info->/data/local/tmp/media/bbb_vp9_640x360_1600kbps_30fps.info"/>
+ <option name="push" value="DATA/media/c2/res/bbb_vp9_640x360_1600kbps_30fps.vp9->/data/local/tmp/media/bbb_vp9_640x360_1600kbps_30fps.vp9"/>
+ <option name="push" value="DATA/media/c2/res/sine_amrnb_1ch_12kbps_8000hz.amrnb->/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.amrnb"/>
+ <option name="push" value="DATA/media/c2/res/sine_amrnb_1ch_12kbps_8000hz.info->/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.info"/>
+ <option name="push" value="DATA/media/c2/res/sine_amrnb_1ch_12kbps_8000hz_multi_frame.info->/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz_multi_frame.info"/>
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
diff --git a/media/omx/V1_0/host/AndroidTest.xml b/media/omx/V1_0/host/AndroidTest.xml
index bdc9096..f6e9084 100644
--- a/media/omx/V1_0/host/AndroidTest.xml
+++ b/media/omx/V1_0/host/AndroidTest.xml
@@ -36,56 +36,56 @@
<option name="push" value="DATA/lib64/android.hardware.media@1.0-vts.driver.so->/data/local/tmp/64/android.hardware.media@1.0-vts.driver.so"/>
<option name="push" value="DATA/lib/android.hardware.media.omx@1.0-vts.driver.so->/data/local/tmp/32/android.hardware.media.omx@1.0-vts.driver.so"/>
<option name="push" value="DATA/lib64/android.hardware.media.omx@1.0-vts.driver.so->/data/local/tmp/64/android.hardware.media.omx@1.0-vts.driver.so"/>
- <option name="push" value="DATA/media/res/bbb_352x288_420p_30fps_32frames.yuv->/sdcard/media/bbb_352x288_420p_30fps_32frames.yuv"/>
- <option name="push" value="DATA/media/res/bbb_avc_176x144_300kbps_60fps.h264->/sdcard/media/bbb_avc_176x144_300kbps_60fps.h264"/>
- <option name="push" value="DATA/media/res/bbb_avc_176x144_300kbps_60fps.info->/sdcard/media/bbb_avc_176x144_300kbps_60fps.info"/>
- <option name="push" value="DATA/media/res/bbb_avc_640x360_768kbps_30fps.h264->/sdcard/media/bbb_avc_640x360_768kbps_30fps.h264"/>
- <option name="push" value="DATA/media/res/bbb_avc_640x360_768kbps_30fps.info->/sdcard/media/bbb_avc_640x360_768kbps_30fps.info"/>
- <option name="push" value="DATA/media/res/bbb_mp3_stereo_192kbps_48000hz.info->/sdcard/media/bbb_mp3_stereo_192kbps_48000hz.info"/>
- <option name="push" value="DATA/media/res/bbb_mp3_stereo_192kbps_48000hz.mp3->/sdcard/media/bbb_mp3_stereo_192kbps_48000hz.mp3"/>
- <option name="push" value="DATA/media/res/bbb_flac_stereo_680kbps_48000hz.flac->/sdcard/media/bbb_flac_stereo_680kbps_48000hz.flac"/>
- <option name="push" value="DATA/media/res/bbb_flac_stereo_680kbps_48000hz.info->/sdcard/media/bbb_flac_stereo_680kbps_48000hz.info"/>
- <option name="push" value="DATA/media/res/bbb_raw_1ch_16khz_s16le.raw->/sdcard/media/bbb_raw_1ch_16khz_s16le.raw"/>
- <option name="push" value="DATA/media/res/bbb_raw_1ch_8khz_s16le.raw->/sdcard/media/bbb_raw_1ch_8khz_s16le.raw"/>
- <option name="push" value="DATA/media/res/bbb_raw_2ch_48khz_s16le.raw->/sdcard/media/bbb_raw_2ch_48khz_s16le.raw"/>
- <option name="push" value="DATA/media/res/sine_amrnb_1ch_12kbps_8000hz.amrnb->/sdcard/media/sine_amrnb_1ch_12kbps_8000hz.amrnb"/>
- <option name="push" value="DATA/media/res/sine_amrnb_1ch_12kbps_8000hz.info->/sdcard/media/sine_amrnb_1ch_12kbps_8000hz.info"/>
- <option name="push" value="DATA/media/res/bbb_h263_352x288_300kbps_12fps.h263->/sdcard/media/bbb_h263_352x288_300kbps_12fps.h263"/>
- <option name="push" value="DATA/media/res/bbb_h263_352x288_300kbps_12fps.info->/sdcard/media/bbb_h263_352x288_300kbps_12fps.info"/>
- <option name="push" value="DATA/media/res/bbb_hevc_176x144_176kbps_60fps.hevc->/sdcard/media/bbb_hevc_176x144_176kbps_60fps.hevc"/>
- <option name="push" value="DATA/media/res/bbb_hevc_176x144_176kbps_60fps.info->/sdcard/media/bbb_hevc_176x144_176kbps_60fps.info"/>
- <option name="push" value="DATA/media/res/bbb_hevc_640x360_1600kbps_30fps.hevc->/sdcard/media/bbb_hevc_640x360_1600kbps_30fps.hevc"/>
- <option name="push" value="DATA/media/res/bbb_hevc_640x360_1600kbps_30fps.info->/sdcard/media/bbb_hevc_640x360_1600kbps_30fps.info"/>
- <option name="push" value="DATA/media/res/bbb_mpeg2_176x144_105kbps_25fps.m2v->/sdcard/media/bbb_mpeg2_176x144_105kbps_25fps.m2v"/>
- <option name="push" value="DATA/media/res/bbb_mpeg2_176x144_105kbps_25fps.info->/sdcard/media/bbb_mpeg2_176x144_105kbps_25fps.info"/>
- <option name="push" value="DATA/media/res/bbb_mpeg2_352x288_1mbps_60fps.m2v->/sdcard/media/bbb_mpeg2_352x288_1mbps_60fps.m2v"/>
- <option name="push" value="DATA/media/res/bbb_mpeg2_352x288_1mbps_60fps.info->/sdcard/media/bbb_mpeg2_352x288_1mbps_60fps.info"/>
- <option name="push" value="DATA/media/res/bbb_mpeg4_352x288_512kbps_30fps.m4v->/sdcard/media/bbb_mpeg4_352x288_512kbps_30fps.m4v"/>
- <option name="push" value="DATA/media/res/bbb_mpeg4_352x288_512kbps_30fps.info->/sdcard/media/bbb_mpeg4_352x288_512kbps_30fps.info"/>
- <option name="push" value="DATA/media/res/bbb_vp8_176x144_240kbps_60fps.vp8->/sdcard/media/bbb_vp8_176x144_240kbps_60fps.vp8"/>
- <option name="push" value="DATA/media/res/bbb_vp8_176x144_240kbps_60fps.info->/sdcard/media/bbb_vp8_176x144_240kbps_60fps.info"/>
- <option name="push" value="DATA/media/res/bbb_vp8_640x360_2mbps_30fps.vp8->/sdcard/media/bbb_vp8_640x360_2mbps_30fps.vp8"/>
- <option name="push" value="DATA/media/res/bbb_vp8_640x360_2mbps_30fps.info->/sdcard/media/bbb_vp8_640x360_2mbps_30fps.info"/>
- <option name="push" value="DATA/media/res/bbb_vp9_176x144_285kbps_60fps.vp9->/sdcard/media/bbb_vp9_176x144_285kbps_60fps.vp9"/>
- <option name="push" value="DATA/media/res/bbb_vp9_176x144_285kbps_60fps.info->/sdcard/media/bbb_vp9_176x144_285kbps_60fps.info"/>
- <option name="push" value="DATA/media/res/bbb_vp9_640x360_1600kbps_30fps.vp9->/sdcard/media/bbb_vp9_640x360_1600kbps_30fps.vp9"/>
- <option name="push" value="DATA/media/res/bbb_vp9_640x360_1600kbps_30fps.info->/sdcard/media/bbb_vp9_640x360_1600kbps_30fps.info"/>
- <option name="push" value="DATA/media/res/bbb_aac_stereo_128kbps_48000hz.aac->/sdcard/media/bbb_aac_stereo_128kbps_48000hz.aac"/>
- <option name="push" value="DATA/media/res/bbb_aac_stereo_128kbps_48000hz.info->/sdcard/media/bbb_aac_stereo_128kbps_48000hz.info"/>
- <option name="push" value="DATA/media/res/bbb_amrwb_1ch_14kbps_16000hz.amrwb->/sdcard/media/bbb_amrwb_1ch_14kbps_16000hz.amrwb"/>
- <option name="push" value="DATA/media/res/bbb_amrwb_1ch_14kbps_16000hz.info->/sdcard/media/bbb_amrwb_1ch_14kbps_16000hz.info"/>
- <option name="push" value="DATA/media/res/bbb_opus_stereo_128kbps_48000hz.opus->/sdcard/media/bbb_opus_stereo_128kbps_48000hz.opus"/>
- <option name="push" value="DATA/media/res/bbb_opus_stereo_128kbps_48000hz.info->/sdcard/media/bbb_opus_stereo_128kbps_48000hz.info"/>
- <option name="push" value="DATA/media/res/bbb_vorbis_stereo_128kbps_48000hz.vorbis->/sdcard/media/bbb_vorbis_stereo_128kbps_48000hz.vorbis"/>
- <option name="push" value="DATA/media/res/bbb_vorbis_stereo_128kbps_48000hz.info->/sdcard/media/bbb_vorbis_stereo_128kbps_48000hz.info"/>
- <option name="push" value="DATA/media/res/bbb_g711alaw_1ch_8khz.raw->/sdcard/media/bbb_g711alaw_1ch_8khz.raw"/>
- <option name="push" value="DATA/media/res/bbb_g711alaw_1ch_8khz.info->/sdcard/media/bbb_g711alaw_1ch_8khz.info"/>
- <option name="push" value="DATA/media/res/bbb_g711mulaw_1ch_8khz.raw->/sdcard/media/bbb_g711mulaw_1ch_8khz.raw"/>
- <option name="push" value="DATA/media/res/bbb_g711mulaw_1ch_8khz.info->/sdcard/media/bbb_g711mulaw_1ch_8khz.info"/>
- <option name="push" value="DATA/media/res/bbb_gsm_1ch_8khz_13kbps.raw->/sdcard/media/bbb_gsm_1ch_8khz_13kbps.raw"/>
- <option name="push" value="DATA/media/res/bbb_gsm_1ch_8khz_13kbps.info->/sdcard/media/bbb_gsm_1ch_8khz_13kbps.info"/>
- <option name="push" value="DATA/media/res/bbb_raw_1ch_8khz_s32le.raw->/sdcard/media/bbb_raw_1ch_8khz_s32le.raw"/>
- <option name="push" value="DATA/media/res/bbb_raw_1ch_8khz_s32le.info->/sdcard/media/bbb_raw_1ch_8khz_s32le.info"/>
+ <option name="push" value="DATA/media/res/bbb_352x288_420p_30fps_32frames.yuv->/data/local/tmp/media/bbb_352x288_420p_30fps_32frames.yuv"/>
+ <option name="push" value="DATA/media/res/bbb_avc_176x144_300kbps_60fps.h264->/data/local/tmp/media/bbb_avc_176x144_300kbps_60fps.h264"/>
+ <option name="push" value="DATA/media/res/bbb_avc_176x144_300kbps_60fps.info->/data/local/tmp/media/bbb_avc_176x144_300kbps_60fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_avc_640x360_768kbps_30fps.h264->/data/local/tmp/media/bbb_avc_640x360_768kbps_30fps.h264"/>
+ <option name="push" value="DATA/media/res/bbb_avc_640x360_768kbps_30fps.info->/data/local/tmp/media/bbb_avc_640x360_768kbps_30fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_mp3_stereo_192kbps_48000hz.info->/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/res/bbb_mp3_stereo_192kbps_48000hz.mp3->/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.mp3"/>
+ <option name="push" value="DATA/media/res/bbb_flac_stereo_680kbps_48000hz.flac->/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.flac"/>
+ <option name="push" value="DATA/media/res/bbb_flac_stereo_680kbps_48000hz.info->/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/res/bbb_raw_1ch_16khz_s16le.raw->/data/local/tmp/media/bbb_raw_1ch_16khz_s16le.raw"/>
+ <option name="push" value="DATA/media/res/bbb_raw_1ch_8khz_s16le.raw->/data/local/tmp/media/bbb_raw_1ch_8khz_s16le.raw"/>
+ <option name="push" value="DATA/media/res/bbb_raw_2ch_48khz_s16le.raw->/data/local/tmp/media/bbb_raw_2ch_48khz_s16le.raw"/>
+ <option name="push" value="DATA/media/res/sine_amrnb_1ch_12kbps_8000hz.amrnb->/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.amrnb"/>
+ <option name="push" value="DATA/media/res/sine_amrnb_1ch_12kbps_8000hz.info->/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.info"/>
+ <option name="push" value="DATA/media/res/bbb_h263_352x288_300kbps_12fps.h263->/data/local/tmp/media/bbb_h263_352x288_300kbps_12fps.h263"/>
+ <option name="push" value="DATA/media/res/bbb_h263_352x288_300kbps_12fps.info->/data/local/tmp/media/bbb_h263_352x288_300kbps_12fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_hevc_176x144_176kbps_60fps.hevc->/data/local/tmp/media/bbb_hevc_176x144_176kbps_60fps.hevc"/>
+ <option name="push" value="DATA/media/res/bbb_hevc_176x144_176kbps_60fps.info->/data/local/tmp/media/bbb_hevc_176x144_176kbps_60fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_hevc_640x360_1600kbps_30fps.hevc->/data/local/tmp/media/bbb_hevc_640x360_1600kbps_30fps.hevc"/>
+ <option name="push" value="DATA/media/res/bbb_hevc_640x360_1600kbps_30fps.info->/data/local/tmp/media/bbb_hevc_640x360_1600kbps_30fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_mpeg2_176x144_105kbps_25fps.m2v->/data/local/tmp/media/bbb_mpeg2_176x144_105kbps_25fps.m2v"/>
+ <option name="push" value="DATA/media/res/bbb_mpeg2_176x144_105kbps_25fps.info->/data/local/tmp/media/bbb_mpeg2_176x144_105kbps_25fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_mpeg2_352x288_1mbps_60fps.m2v->/data/local/tmp/media/bbb_mpeg2_352x288_1mbps_60fps.m2v"/>
+ <option name="push" value="DATA/media/res/bbb_mpeg2_352x288_1mbps_60fps.info->/data/local/tmp/media/bbb_mpeg2_352x288_1mbps_60fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_mpeg4_352x288_512kbps_30fps.m4v->/data/local/tmp/media/bbb_mpeg4_352x288_512kbps_30fps.m4v"/>
+ <option name="push" value="DATA/media/res/bbb_mpeg4_352x288_512kbps_30fps.info->/data/local/tmp/media/bbb_mpeg4_352x288_512kbps_30fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_vp8_176x144_240kbps_60fps.vp8->/data/local/tmp/media/bbb_vp8_176x144_240kbps_60fps.vp8"/>
+ <option name="push" value="DATA/media/res/bbb_vp8_176x144_240kbps_60fps.info->/data/local/tmp/media/bbb_vp8_176x144_240kbps_60fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_vp8_640x360_2mbps_30fps.vp8->/data/local/tmp/media/bbb_vp8_640x360_2mbps_30fps.vp8"/>
+ <option name="push" value="DATA/media/res/bbb_vp8_640x360_2mbps_30fps.info->/data/local/tmp/media/bbb_vp8_640x360_2mbps_30fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_vp9_176x144_285kbps_60fps.vp9->/data/local/tmp/media/bbb_vp9_176x144_285kbps_60fps.vp9"/>
+ <option name="push" value="DATA/media/res/bbb_vp9_176x144_285kbps_60fps.info->/data/local/tmp/media/bbb_vp9_176x144_285kbps_60fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_vp9_640x360_1600kbps_30fps.vp9->/data/local/tmp/media/bbb_vp9_640x360_1600kbps_30fps.vp9"/>
+ <option name="push" value="DATA/media/res/bbb_vp9_640x360_1600kbps_30fps.info->/data/local/tmp/media/bbb_vp9_640x360_1600kbps_30fps.info"/>
+ <option name="push" value="DATA/media/res/bbb_aac_stereo_128kbps_48000hz.aac->/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.aac"/>
+ <option name="push" value="DATA/media/res/bbb_aac_stereo_128kbps_48000hz.info->/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/res/bbb_amrwb_1ch_14kbps_16000hz.amrwb->/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.amrwb"/>
+ <option name="push" value="DATA/media/res/bbb_amrwb_1ch_14kbps_16000hz.info->/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.info"/>
+ <option name="push" value="DATA/media/res/bbb_opus_stereo_128kbps_48000hz.opus->/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.opus"/>
+ <option name="push" value="DATA/media/res/bbb_opus_stereo_128kbps_48000hz.info->/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/res/bbb_vorbis_stereo_128kbps_48000hz.vorbis->/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.vorbis"/>
+ <option name="push" value="DATA/media/res/bbb_vorbis_stereo_128kbps_48000hz.info->/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.info"/>
+ <option name="push" value="DATA/media/res/bbb_g711alaw_1ch_8khz.raw->/data/local/tmp/media/bbb_g711alaw_1ch_8khz.raw"/>
+ <option name="push" value="DATA/media/res/bbb_g711alaw_1ch_8khz.info->/data/local/tmp/media/bbb_g711alaw_1ch_8khz.info"/>
+ <option name="push" value="DATA/media/res/bbb_g711mulaw_1ch_8khz.raw->/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.raw"/>
+ <option name="push" value="DATA/media/res/bbb_g711mulaw_1ch_8khz.info->/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.info"/>
+ <option name="push" value="DATA/media/res/bbb_gsm_1ch_8khz_13kbps.raw->/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.raw"/>
+ <option name="push" value="DATA/media/res/bbb_gsm_1ch_8khz_13kbps.info->/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.info"/>
+ <option name="push" value="DATA/media/res/bbb_raw_1ch_8khz_s32le.raw->/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.raw"/>
+ <option name="push" value="DATA/media/res/bbb_raw_1ch_8khz_s32le.info->/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.info"/>
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsHalMediaOmxV1_0Host"/>
diff --git a/oemlock/V1_0/target/AndroidTest.xml b/oemlock/V1_0/target/AndroidTest.xml
index caa8adb..2227d62 100644
--- a/oemlock/V1_0/target/AndroidTest.xml
+++ b/oemlock/V1_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalOemLockV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalOemLockV1_0TargetTest/VtsHalOemLockV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalOemLockV1_0TargetTest/VtsHalOemLockV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="5m"/>
</test>
diff --git a/radio/V1_0/target/radio/AndroidTest.xml b/radio/V1_0/target/radio/AndroidTest.xml
index e8bdb77..b8b0605 100644
--- a/radio/V1_0/target/radio/AndroidTest.xml
+++ b/radio/V1_0/target/radio/AndroidTest.xml
@@ -23,12 +23,12 @@
<option name="enable-radio-log" value="true"/>
<option name="restore-radio-log" value="true"/>
</target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsMultiSimPreparer" />
+ <target_preparer class="com.android.tradefed.targetprep.MultiSimPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsHalRadioV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRadioV1_0TargetTest/VtsHalRadioV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRadioV1_0TargetTest/VtsHalRadioV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
<!-- The following test is disabled due to b/64734869 -->
diff --git a/radio/V1_0/target/sap/AndroidTest.xml b/radio/V1_0/target/sap/AndroidTest.xml
index ee063e2..23daae1 100644
--- a/radio/V1_0/target/sap/AndroidTest.xml
+++ b/radio/V1_0/target/sap/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalSapV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalSapV1_0TargetTest/VtsHalSapV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalSapV1_0TargetTest/VtsHalSapV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
</test>
diff --git a/radio/V1_1/target/radio/AndroidTest.xml b/radio/V1_1/target/radio/AndroidTest.xml
index c60cebc..eada1e6 100644
--- a/radio/V1_1/target/radio/AndroidTest.xml
+++ b/radio/V1_1/target/radio/AndroidTest.xml
@@ -23,12 +23,12 @@
<option name="enable-radio-log" value="true"/>
<option name="restore-radio-log" value="true"/>
</target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsMultiSimPreparer" />
+ <target_preparer class="com.android.tradefed.targetprep.MultiSimPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsHalRadioV1_1Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRadioV1_1TargetTest/VtsHalRadioV1_1TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRadioV1_1TargetTest/VtsHalRadioV1_1TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
</test>
diff --git a/radio/V1_2/target/radio/AndroidTest.xml b/radio/V1_2/target/radio/AndroidTest.xml
index 9e08db1..456766f 100644
--- a/radio/V1_2/target/radio/AndroidTest.xml
+++ b/radio/V1_2/target/radio/AndroidTest.xml
@@ -23,12 +23,12 @@
<option name="enable-radio-log" value="true"/>
<option name="restore-radio-log" value="true"/>
</target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsMultiSimPreparer" />
+ <target_preparer class="com.android.tradefed.targetprep.MultiSimPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsHalRadioV1_2Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRadioV1_2TargetTest/VtsHalRadioV1_2TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRadioV1_2TargetTest/VtsHalRadioV1_2TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
<!-- b/64734869: a known incompatibility with new tests (waiver) -->
diff --git a/radio/V1_3/target/radio/AndroidTest.xml b/radio/V1_3/target/radio/AndroidTest.xml
index b508d57..6c15174 100644
--- a/radio/V1_3/target/radio/AndroidTest.xml
+++ b/radio/V1_3/target/radio/AndroidTest.xml
@@ -23,12 +23,12 @@
<option name="enable-radio-log" value="true"/>
<option name="restore-radio-log" value="true"/>
</target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsMultiSimPreparer" />
+ <target_preparer class="com.android.tradefed.targetprep.MultiSimPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsHalRadioV1_3Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRadioV1_3TargetTest/VtsHalRadioV1_3TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRadioV1_3TargetTest/VtsHalRadioV1_3TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
<!--Disable the test because it's not implemented in Q, b/130254624-->
diff --git a/radio/V1_4/target/radio/AndroidTest.xml b/radio/V1_4/target/radio/AndroidTest.xml
index aca8bed..1552046 100644
--- a/radio/V1_4/target/radio/AndroidTest.xml
+++ b/radio/V1_4/target/radio/AndroidTest.xml
@@ -27,7 +27,7 @@
<option name="test-module-name" value="VtsHalRadioV1_4Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRadioV1_4TargetTest/VtsHalRadioV1_4TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRadioV1_4TargetTest/VtsHalRadioV1_4TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
</test>
diff --git a/radio/config/V1_3/target/radio/config/Android.mk b/radio/config/V1_3/target/radio/config/Android.mk
new file mode 100644
index 0000000..1c35f4e
--- /dev/null
+++ b/radio/config/V1_3/target/radio/config/Android.mk
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalRadioConfigV1_3Target
+include test/vts/tools/build/Android.host_config.mk
diff --git a/radio/config/V1_3/target/radio/config/AndroidTest.xml b/radio/config/V1_3/target/radio/config/AndroidTest.xml
new file mode 100644
index 0000000..fd7649e
--- /dev/null
+++ b/radio/config/V1_3/target/radio/config/AndroidTest.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+<configuration description="Config for VTS VtsHalRadioConfigV1_3Target test cases">
+ <option name="config-descriptor:metadata" key="plan" value="vts-hal" />
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false"/>
+ <option name="push-group" value="HalHidlTargetTest.push"/>
+ </target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.VtsDevicePreparer">
+ <option name="enable-radio-log" value="true"/>
+ <option name="restore-radio-log" value="true"/>
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+ <option name="test-module-name" value="VtsHalRadioConfigV1_3Target"/>
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRadioConfigV1_3TargetTest/VtsHalRadioConfigV1_3TargetTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRadioConfigV1_3TargetTest/VtsHalRadioConfigV1_3TargetTest"/>
+ <option name="binary-test-type" value="gtest"/>
+ <option name="binary-test-disable-framework" value="true"/>
+ <option name="test-timeout" value="15m"/>
+ </test>
+</configuration>
diff --git a/renderscript/V1_0/target/AndroidTest.xml b/renderscript/V1_0/target/AndroidTest.xml
index 68eda67..4396952 100644
--- a/renderscript/V1_0/target/AndroidTest.xml
+++ b/renderscript/V1_0/target/AndroidTest.xml
@@ -25,7 +25,7 @@
<option name="binary-test-working-directory" value="_64bit::/data/nativetest64/" />
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRenderscriptV1_0TargetTest/VtsHalRenderscriptV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRenderscriptV1_0TargetTest/VtsHalRenderscriptV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="exclude-coverage-path" value="frameworks/av/media" />
<option name="exclude-coverage-path" value="hardware/interfaces/graphics/mapper/2.0" />
<option name="exclude-coverage-path" value="hardware/qcom/display" />
diff --git a/secure_element/V1_0/target/AndroidTest.xml b/secure_element/V1_0/target/AndroidTest.xml
index d757c8a..84f8b01 100644
--- a/secure_element/V1_0/target/AndroidTest.xml
+++ b/secure_element/V1_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalSecureElementV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalSecureElementV1_0TargetTest/VtsHalSecureElementV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalSecureElementV1_0TargetTest/VtsHalSecureElementV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="5m"/>
<option name="runtime-hint" value="2m"/>
diff --git a/sensors/V1_0/target/AndroidTest.xml b/sensors/V1_0/target/AndroidTest.xml
index a411826..d0c3bb2 100644
--- a/sensors/V1_0/target/AndroidTest.xml
+++ b/sensors/V1_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalSensorsV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalSensorsV1_0TargetTest/VtsHalSensorsV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalSensorsV1_0TargetTest/VtsHalSensorsV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
<option name="runtime-hint" value="5m"/>
diff --git a/sensors/V2_0/target/AndroidTest.xml b/sensors/V2_0/target/AndroidTest.xml
index 53065df..f08bc7b 100644
--- a/sensors/V2_0/target/AndroidTest.xml
+++ b/sensors/V2_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalSensorsV2_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalSensorsV2_0TargetTest/VtsHalSensorsV2_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalSensorsV2_0TargetTest/VtsHalSensorsV2_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
<option name="runtime-hint" value="5m"/>
diff --git a/tetheroffload/control/V1_0/target/AndroidTest.xml b/tetheroffload/control/V1_0/target/AndroidTest.xml
index 9e59e28..2c8d696 100644
--- a/tetheroffload/control/V1_0/target/AndroidTest.xml
+++ b/tetheroffload/control/V1_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalTetherOffloadControlV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalTetheroffloadControlV1_0TargetTest/VtsHalTetheroffloadControlV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalTetheroffloadControlV1_0TargetTest/VtsHalTetheroffloadControlV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
<option name="runtime-hint" value="6m"/>
diff --git a/treble/vendor_vintf/AndroidTest.xml b/treble/vendor_vintf/AndroidTest.xml
index dc9d62f..6ad83f8 100644
--- a/treble/vendor_vintf/AndroidTest.xml
+++ b/treble/vendor_vintf/AndroidTest.xml
@@ -15,7 +15,7 @@
-->
<configuration description="Config for VTS VtsTrebleVendorVintfTest test cases">
<option name="config-descriptor:metadata" key="plan" value="vts-treble" />
- <target_preparer class="com.android.tradefed.targetprep.VtsMultiSimPreparer" />
+ <target_preparer class="com.android.tradefed.targetprep.MultiSimPreparer" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HalHidlTargetTest.push"/>
diff --git a/treble/vintf/DeviceMatrixTest.cpp b/treble/vintf/DeviceMatrixTest.cpp
index 86b4fd5..94fb433 100644
--- a/treble/vintf/DeviceMatrixTest.cpp
+++ b/treble/vintf/DeviceMatrixTest.cpp
@@ -36,6 +36,11 @@
}
TEST_F(DeviceMatrixTest, VndkVersion) {
+ if (GetShippingApiLevel() < 28) {
+ GTEST_SKIP()
+ << "VNDK version doesn't need to be set on devices before Android P";
+ }
+
std::string syspropVndkVersion = GetProperty(kVndkVersionProp, "");
ASSERT_NE("", syspropVndkVersion)
<< kVndkVersionProp << " must not be empty.";
diff --git a/treble/vintf/SingleManifestTest.cpp b/treble/vintf/SingleManifestTest.cpp
index 32cad70..5b2e07b 100644
--- a/treble/vintf/SingleManifestTest.cpp
+++ b/treble/vintf/SingleManifestTest.cpp
@@ -53,13 +53,19 @@
}
}
-void FailureHashMissing(const FQName &fq_name) {
+void FailureHashMissing(const FQName &fq_name,
+ bool vehicle_hal_in_automotive_device) {
if (LegacyAndExempt(fq_name)) {
cout << "[ WARNING ] " << fq_name.string()
<< " has an empty hash but is exempted because it is legacy. It is "
"still recommended to fix this. This is because it was compiled "
"without being frozen in a corresponding current.txt file."
<< endl;
+ } else if (vehicle_hal_in_automotive_device) {
+ cout << "[ WARNING ] " << fq_name.string()
+ << " has an empty hash but is exempted because it is IVehicle in an"
+ "automotive device."
+ << endl;
} else {
ADD_FAILURE()
<< fq_name.string()
@@ -397,6 +403,9 @@
// Tests that HAL interfaces are officially released.
TEST_P(SingleManifestTest, InterfacesAreReleased) {
+ // Device support automotive features.
+ const static bool automotive_device =
+ DeviceSupportsFeature("android.hardware.type.automotive");
// Verifies that HAL are released by fetching the hash of the interface and
// comparing it to the set of known hashes of released interfaces.
HidlVerifyFn is_released = [](const FQName &fq_name,
@@ -440,12 +449,16 @@
}
string hash = hash_chain[i];
+ bool vehicle_hal_in_automotive_device =
+ automotive_device &&
+ fq_iface_name.string() ==
+ "android.hardware.automotive.vehicle@2.0::IVehicle";
if (hash == Hash::hexString(Hash::kEmptyHash)) {
- FailureHashMissing(fq_iface_name);
+ FailureHashMissing(fq_iface_name, vehicle_hal_in_automotive_device);
}
if (IsAndroidPlatformInterface(fq_iface_name) &&
- !IsVehiclHalInterfaceInAutomotiveDevice(fq_iface_name)) {
+ !vehicle_hal_in_automotive_device) {
set<string> released_hashes = ReleasedHashes(fq_iface_name);
EXPECT_NE(released_hashes.find(hash), released_hashes.end())
<< "Hash not found. This interface was not released." << endl
diff --git a/treble/vintf/SystemVendorTest.cpp b/treble/vintf/SystemVendorTest.cpp
index 2021251..2fb7245 100644
--- a/treble/vintf/SystemVendorTest.cpp
+++ b/treble/vintf/SystemVendorTest.cpp
@@ -97,10 +97,10 @@
// AVB version is not a compliance requirement.
TEST_F(SystemVendorTest, VendorFrameworkCompatibility) {
string error;
- EXPECT_EQ(android::vintf::COMPATIBLE,
- VintfObject::CheckCompatibility(
- {}, &error,
- ::android::vintf::CheckFlags::ENABLE_ALL_CHECKS.disableAvb()))
+ EXPECT_EQ(
+ android::vintf::COMPATIBLE,
+ VintfObject::GetInstance()->checkCompatibility(
+ &error, ::android::vintf::CheckFlags::ENABLE_ALL_CHECKS.disableAvb()))
<< error;
}
diff --git a/treble/vintf/utils.cpp b/treble/vintf/utils.cpp
index 1718f74..32bec85 100644
--- a/treble/vintf/utils.cpp
+++ b/treble/vintf/utils.cpp
@@ -35,12 +35,6 @@
// Name of file containing HAL hashes.
const string kHashFileName = "current.txt";
-// Name of automotive device flag.
-const string kAutomotive = "automotive";
-
-// Name of Vehicl HAL interface.
-const string kVehicleHAL = "android.hardware.automotive.vehicle@2.0::IVehicle";
-
// Map from package name to package root.
const map<string, string> kPackageRoot = {
{"android.frameworks", "frameworks/hardware/interfaces/"},
@@ -111,11 +105,22 @@
return !PackageRoot(fq_iface_name).empty();
}
-// Returns true iff HAL interface is Vehicle HAL and the device is
-// a automotive device.
-bool IsVehiclHalInterfaceInAutomotiveDevice(const FQName &fq_iface_name) {
- return fq_iface_name.string() == kVehicleHAL &&
- android::base::GetProperty("ro.hardware.type", "") == kAutomotive;
+// Returns true iff the device has the specified feature.
+bool DeviceSupportsFeature(const char *feature) {
+ bool device_supports_feature = false;
+ FILE *p = popen("pm list features", "re");
+ if (p) {
+ char *line = NULL;
+ size_t len = 0;
+ while (getline(&line, &len, p) > 0) {
+ if (strstr(line, feature)) {
+ device_supports_feature = true;
+ break;
+ }
+ }
+ pclose(p);
+ }
+ return device_supports_feature;
}
// Returns the set of released hashes for a given HAL interface.
diff --git a/treble/vintf/utils.h b/treble/vintf/utils.h
index 03a3d85..eeafef1 100644
--- a/treble/vintf/utils.h
+++ b/treble/vintf/utils.h
@@ -95,9 +95,8 @@
// Returns true iff HAL interface is Android platform.
bool IsAndroidPlatformInterface(const FQName& fq_iface_name);
-// Returns true iff HAL interface is Vehicle HAL and the device is
-// a automotive device.
-bool IsVehiclHalInterfaceInAutomotiveDevice(const FQName& fq_iface_name);
+// Returns true iff the device has the specified feature.
+bool DeviceSupportsFeature(const char* feature);
// Returns the set of released hashes for a given HAL interface.
set<string> ReleasedHashes(const FQName& fq_iface_name);
diff --git a/usb/V1_0/target/AndroidTest.xml b/usb/V1_0/target/AndroidTest.xml
index b903245..9a05b42 100644
--- a/usb/V1_0/target/AndroidTest.xml
+++ b/usb/V1_0/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalUsbV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalUsbV1_0TargetTest/VtsHalUsbV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalUsbV1_0TargetTest/VtsHalUsbV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="exclude-filter" value="UsbHidlTest.switchModetoDFP" />
<option name="test-timeout" value="15m"/>
diff --git a/usb/V1_1/target/AndroidTest.xml b/usb/V1_1/target/AndroidTest.xml
index f0ce71b..b7f0740 100644
--- a/usb/V1_1/target/AndroidTest.xml
+++ b/usb/V1_1/target/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalUsbV1_1Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalUsbV1_1TargetTest/VtsHalUsbV1_1TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalUsbV1_1TargetTest/VtsHalUsbV1_1TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="test-timeout" value="15m"/>
</test>
diff --git a/wifi/supplicant/V1_0/target/AndroidTest.xml b/wifi/supplicant/V1_0/target/AndroidTest.xml
new file mode 100644
index 0000000..7539178
--- /dev/null
+++ b/wifi/supplicant/V1_0/target/AndroidTest.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.
+-->
+<configuration description="Config for VTS VtsHalWifiSupplicantV1_0Target test cases">
+ <option name="config-descriptor:metadata" key="plan" value="vts-hal" />
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false"/>
+ <option name="push-group" value="HalHidlTargetTest.push"/>
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+ <option name="test-module-name" value="VtsHalWifiSupplicantV1_0TargetTest"/>
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalWifiSupplicantV1_0TargetTest/VtsHalWifiSupplicantV1_0TargetTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalWifiSupplicantV1_0TargetTest/VtsHalWifiSupplicantV1_0TargetTest"/>
+ <option name="binary-test-type" value="gtest"/>
+ <option name="binary-test-disable-framework" value="true"/>
+ <option name="binary-test-stop-native-servers" value="true"/>
+ <option name="precondition-feature" value="android.hardware.wifi.direct" />
+ <option name="test-timeout" value="30m"/>
+ </test>
+</configuration>
diff --git a/wifi/supplicant/V1_0/target/p2p/AndroidTest.xml b/wifi/supplicant/V1_0/target/p2p/AndroidTest.xml
index 0ab69ed..82ad68e 100644
--- a/wifi/supplicant/V1_0/target/p2p/AndroidTest.xml
+++ b/wifi/supplicant/V1_0/target/p2p/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="test-module-name" value="VtsHalWifiSupplicantP2pV1_0Target"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalWifiSupplicantP2pV1_0TargetTest/VtsHalWifiSupplicantP2pV1_0TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalWifiSupplicantP2pV1_0TargetTest/VtsHalWifiSupplicantP2pV1_0TargetTest"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-feature" value="android.hardware.wifi.direct" />
