Merge "Fix test name for Atrace 1.0" into qt-dev
diff --git a/audio/effect/V5_0/target/Android.bp b/audio/effect/V5_0/target/Android.bp
index 2d293b8..39dfa0e 100644
--- a/audio/effect/V5_0/target/Android.bp
+++ b/audio/effect/V5_0/target/Android.bp
@@ -15,5 +15,5 @@
//
vts_config {
- name: "VtsHalAudioEffectV4_0TargetProfiling",
+ name: "VtsHalAudioEffectV5_0Target",
}
diff --git a/radio/V1_0/target/radio/AndroidTest.xml b/radio/V1_0/target/radio/AndroidTest.xml
index 6d5cc3a..e8bdb77 100644
--- a/radio/V1_0/target/radio/AndroidTest.xml
+++ b/radio/V1_0/target/radio/AndroidTest.xml
@@ -23,6 +23,7 @@
<option name="enable-radio-log" value="true"/>
<option name="restore-radio-log" value="true"/>
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.VtsMultiSimPreparer" />
<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"/>
diff --git a/radio/V1_1/target/radio/AndroidTest.xml b/radio/V1_1/target/radio/AndroidTest.xml
index 8319186..c60cebc 100644
--- a/radio/V1_1/target/radio/AndroidTest.xml
+++ b/radio/V1_1/target/radio/AndroidTest.xml
@@ -23,6 +23,7 @@
<option name="enable-radio-log" value="true"/>
<option name="restore-radio-log" value="true"/>
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.VtsMultiSimPreparer" />
<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"/>
diff --git a/radio/V1_2/target/radio/AndroidTest.xml b/radio/V1_2/target/radio/AndroidTest.xml
index 19f73aa..9e08db1 100644
--- a/radio/V1_2/target/radio/AndroidTest.xml
+++ b/radio/V1_2/target/radio/AndroidTest.xml
@@ -23,6 +23,7 @@
<option name="enable-radio-log" value="true"/>
<option name="restore-radio-log" value="true"/>
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.VtsMultiSimPreparer" />
<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"/>
diff --git a/radio/V1_3/target/radio/AndroidTest.xml b/radio/V1_3/target/radio/AndroidTest.xml
index 008b426..b508d57 100644
--- a/radio/V1_3/target/radio/AndroidTest.xml
+++ b/radio/V1_3/target/radio/AndroidTest.xml
@@ -23,6 +23,7 @@
<option name="enable-radio-log" value="true"/>
<option name="restore-radio-log" value="true"/>
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.VtsMultiSimPreparer" />
<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"/>
diff --git a/radio/config/V1_1/target/radio/config/Android.mk b/radio/config/V1_1/target/radio/config/Android.mk
new file mode 100644
index 0000000..fe788e8
--- /dev/null
+++ b/radio/config/V1_1/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_1Target
+include test/vts/tools/build/Android.host_config.mk
diff --git a/radio/config/V1_1/target/radio/config/AndroidTest.xml b/radio/config/V1_1/target/radio/config/AndroidTest.xml
new file mode 100644
index 0000000..7f1f09c
--- /dev/null
+++ b/radio/config/V1_1/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_1Target 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_1Target"/>
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRadioConfigV1_1TargetTest/VtsHalRadioConfigV1_1TargetTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRadioConfigV1_1TargetTest/VtsHalRadioConfigV1_1TargetTest"/>
+ <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-disable-framework" value="true"/>
+ <option name="test-timeout" value="15m"/>
+ </test>
+</configuration>
diff --git a/radio/config/V1_2/target/radio/config/Android.mk b/radio/config/V1_2/target/radio/config/Android.mk
new file mode 100644
index 0000000..d91ab21
--- /dev/null
+++ b/radio/config/V1_2/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_2Target
+include test/vts/tools/build/Android.host_config.mk
diff --git a/radio/config/V1_2/target/radio/config/AndroidTest.xml b/radio/config/V1_2/target/radio/config/AndroidTest.xml
new file mode 100644
index 0000000..a0b3a8b
--- /dev/null
+++ b/radio/config/V1_2/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_2Target 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_2Target"/>
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRadioConfigV1_2TargetTest/VtsHalRadioConfigV1_2TargetTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRadioConfigV1_2TargetTest/VtsHalRadioConfigV1_2TargetTest"/>
+ <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-disable-framework" value="true"/>
+ <option name="test-timeout" value="15m"/>
+ </test>
+</configuration>