Merge "Add test target for 1.4"
diff --git a/OWNERS b/OWNERS
index 17c17c9..97df5d9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
yim@google.com
zhuoyao@google.com
yuexima@google.com
+guangzhu@google.com
diff --git a/build/soong/hal2vts.go b/build/soong/hal2vts.go
index 670280d..01e1b5a 100644
--- a/build/soong/hal2vts.go
+++ b/build/soong/hal2vts.go
@@ -47,8 +47,8 @@
type hal2vtsProperties struct {
Hidl_gen_args string
- Srcs []string
- Out []string
+ Srcs []string
+ Out []string
}
type hal2vts struct {
@@ -142,8 +142,10 @@
return h
}
+var vtsListKey = android.NewOnceKey("vtsList")
+
func vtsList(config android.Config) *android.Paths {
- return config.Once("vtsList", func() interface{} {
+ return config.Once(vtsListKey, func() interface{} {
return &android.Paths{}
}).(*android.Paths)
}
diff --git a/camera/device/V3_3/adapter/Android.mk b/camera/device/V3_3/adapter/Android.mk
deleted file mode 100644
index 9957433..0000000
--- a/camera/device/V3_3/adapter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2018 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 := VtsHalCameraDeviceV3_3Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/camera/device/V3_3/adapter
-include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/Android.mk b/camera/device/V3_3/adapter/CtsCameraTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to camera/device/V3_3/adapter/CtsCameraTestCases/Android.mk
index abfb48d..4528f08 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/camera/device/V3_3/adapter/CtsCameraTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalCameraDeviceV3_3AdapterCtsCameraTestCases
include test/vts/tools/build/Android.host_config.mk
diff --git a/camera/device/V3_3/adapter/AndroidTest.xml b/camera/device/V3_3/adapter/CtsCameraTestCases/AndroidTest.xml
similarity index 95%
copy from camera/device/V3_3/adapter/AndroidTest.xml
copy to camera/device/V3_3/adapter/CtsCameraTestCases/AndroidTest.xml
index 7c1728d..9865892 100644
--- a/camera/device/V3_3/adapter/AndroidTest.xml
+++ b/camera/device/V3_3/adapter/CtsCameraTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalCameraDeviceV3_3Adapter test cases">
+<configuration description="Config for VTS VtsHalCameraDeviceV3_3AdapterCtsCameraTestCases test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
<object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
<option name="hal-package-name" value="android.hardware.camera.device@3.3"/>
@@ -27,5 +27,4 @@
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
</test>
<include name="CtsCameraTestCases.config"/>
- <include name="CtsStatsdHostTestCases.config"/>
</configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/camera/device/V3_3/adapter/CtsStatsdHostTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to camera/device/V3_3/adapter/CtsStatsdHostTestCases/Android.mk
index abfb48d..201c4f2 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/camera/device/V3_3/adapter/CtsStatsdHostTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalCameraDeviceV3_3AdapterCtsStatsdHostTestCases
include test/vts/tools/build/Android.host_config.mk
diff --git a/camera/device/V3_3/adapter/AndroidTest.xml b/camera/device/V3_3/adapter/CtsStatsdHostTestCases/AndroidTest.xml
similarity index 95%
rename from camera/device/V3_3/adapter/AndroidTest.xml
rename to camera/device/V3_3/adapter/CtsStatsdHostTestCases/AndroidTest.xml
index 7c1728d..03a0f36 100644
--- a/camera/device/V3_3/adapter/AndroidTest.xml
+++ b/camera/device/V3_3/adapter/CtsStatsdHostTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalCameraDeviceV3_3Adapter test cases">
+<configuration description="Config for VTS VtsHalCameraDeviceV3_3AdapterCtsStatsdHostTestCases test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
<object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
<option name="hal-package-name" value="android.hardware.camera.device@3.3"/>
@@ -26,6 +26,5 @@
<option name="package" value="com.android.devicehealth.tests"/>
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
</test>
- <include name="CtsCameraTestCases.config"/>
<include name="CtsStatsdHostTestCases.config"/>
</configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/gnss/V1_1/adapter/CtsLocationTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to gnss/V1_1/adapter/CtsLocationTestCases/Android.mk
index abfb48d..cdc1717 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/gnss/V1_1/adapter/CtsLocationTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalGnssV1_1AdapterCtsLocationTestCases
include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/AndroidTest.xml b/gnss/V1_1/adapter/CtsLocationTestCases/AndroidTest.xml
similarity index 95%
rename from gnss/V1_1/adapter/AndroidTest.xml
rename to gnss/V1_1/adapter/CtsLocationTestCases/AndroidTest.xml
index 8b431f2..f1fbc7c 100644
--- a/gnss/V1_1/adapter/AndroidTest.xml
+++ b/gnss/V1_1/adapter/CtsLocationTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalGnssV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalGnssV1_1AdapterCtsLocationTestCases test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
<object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
<option name="hal-package-name" value="android.hardware.gnss@1.1"/>
@@ -27,5 +27,4 @@
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
</test>
<include name="CtsLocationTestCases.config"/>
- <include name="CtsStatsdHostTestCases.config"/>
</configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/gnss/V1_1/adapter/CtsStatsdHostTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to gnss/V1_1/adapter/CtsStatsdHostTestCases/Android.mk
index abfb48d..57cd8e6 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/gnss/V1_1/adapter/CtsStatsdHostTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalGnssV1_1AdapterCtsStatsdHostTestCases
include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/AndroidTest.xml b/gnss/V1_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
similarity index 95%
copy from gnss/V1_1/adapter/AndroidTest.xml
copy to gnss/V1_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
index 8b431f2..cd27599 100644
--- a/gnss/V1_1/adapter/AndroidTest.xml
+++ b/gnss/V1_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalGnssV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalGnssV1_1AdapterCtsStatsdHostTestCases test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
<object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
<option name="hal-package-name" value="android.hardware.gnss@1.1"/>
@@ -26,6 +26,5 @@
<option name="package" value="com.android.devicehealth.tests"/>
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
</test>
- <include name="CtsLocationTestCases.config"/>
<include name="CtsStatsdHostTestCases.config"/>
</configuration>
diff --git a/radio/OWNERS b/radio/OWNERS
new file mode 100644
index 0000000..120a1aa
--- /dev/null
+++ b/radio/OWNERS
@@ -0,0 +1,7 @@
+#Telephony team VTS owners for radio
+hallliu@google.com
+rgreenwalt@google.com
+jminjie@google.com
+shuoq@google.com
+refuhoo@google.com
+nazaninb@google.com
diff --git a/radio/V1_1/adapter/Android.mk b/radio/V1_1/adapter/Android.mk
deleted file mode 100644
index 52e4a0e..0000000
--- a/radio/V1_1/adapter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2018 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 := VtsHalRadioV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/radio/V1_1/adapter
-include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/Android.mk b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/Android.mk
similarity index 88%
rename from gnss/V1_1/adapter/Android.mk
rename to radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/Android.mk
index abfb48d..041476d 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalRadioV1_1AdapterCtsDevicePolicyManagerTestCases
include test/vts/tools/build/Android.host_config.mk
diff --git a/radio/V1_1/adapter/AndroidTest.xml b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/AndroidTest.xml
similarity index 92%
copy from radio/V1_1/adapter/AndroidTest.xml
copy to radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/AndroidTest.xml
index 1e1d782..b1e9fd9 100644
--- a/radio/V1_1/adapter/AndroidTest.xml
+++ b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalRadioV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalRadioV1_1AdapterCtsDevicePolicyManagerTestCases test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
<object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
<option name="hal-package-name" value="android.hardware.radio@1.1"/>
@@ -27,6 +27,4 @@
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
</test>
<include name="CtsDevicePolicyManagerTestCases.config"/>
- <include name="CtsJobSchedulerTestCases.config"/>
- <include name="CtsTelephonyTestCases.config"/>
</configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/radio/V1_1/adapter/CtsJobSchedulerTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to radio/V1_1/adapter/CtsJobSchedulerTestCases/Android.mk
index abfb48d..208c0c3 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/radio/V1_1/adapter/CtsJobSchedulerTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalRadioV1_1AdapterCtsJobSchedulerTestCases
include test/vts/tools/build/Android.host_config.mk
diff --git a/radio/V1_1/adapter/AndroidTest.xml b/radio/V1_1/adapter/CtsJobSchedulerTestCases/AndroidTest.xml
similarity index 92%
rename from radio/V1_1/adapter/AndroidTest.xml
rename to radio/V1_1/adapter/CtsJobSchedulerTestCases/AndroidTest.xml
index 1e1d782..7570289 100644
--- a/radio/V1_1/adapter/AndroidTest.xml
+++ b/radio/V1_1/adapter/CtsJobSchedulerTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalRadioV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalRadioV1_1AdapterCtsJobSchedulerTestCases test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
<object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
<option name="hal-package-name" value="android.hardware.radio@1.1"/>
@@ -26,7 +26,5 @@
<option name="package" value="com.android.devicehealth.tests"/>
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
</test>
- <include name="CtsDevicePolicyManagerTestCases.config"/>
<include name="CtsJobSchedulerTestCases.config"/>
- <include name="CtsTelephonyTestCases.config"/>
</configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/radio/V1_1/adapter/CtsTelephonyTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to radio/V1_1/adapter/CtsTelephonyTestCases/Android.mk
index abfb48d..805f949 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/radio/V1_1/adapter/CtsTelephonyTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalRadioV1_1AdapterCtsTelephonyTestCases
include test/vts/tools/build/Android.host_config.mk
diff --git a/radio/V1_1/adapter/AndroidTest.xml b/radio/V1_1/adapter/CtsTelephonyTestCases/AndroidTest.xml
similarity index 92%
copy from radio/V1_1/adapter/AndroidTest.xml
copy to radio/V1_1/adapter/CtsTelephonyTestCases/AndroidTest.xml
index 1e1d782..541b692 100644
--- a/radio/V1_1/adapter/AndroidTest.xml
+++ b/radio/V1_1/adapter/CtsTelephonyTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalRadioV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalRadioV1_1AdapterCtsTelephonyTestCases test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
<object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
<option name="hal-package-name" value="android.hardware.radio@1.1"/>
@@ -26,7 +26,5 @@
<option name="package" value="com.android.devicehealth.tests"/>
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
</test>
- <include name="CtsDevicePolicyManagerTestCases.config"/>
- <include name="CtsJobSchedulerTestCases.config"/>
<include name="CtsTelephonyTestCases.config"/>
</configuration>
diff --git a/radio/V1_2/target/radio/AndroidTest.xml b/radio/V1_2/target/radio/AndroidTest.xml
index fc815fb..6e6cea4 100644
--- a/radio/V1_2/target/radio/AndroidTest.xml
+++ b/radio/V1_2/target/radio/AndroidTest.xml
@@ -32,7 +32,7 @@
<option name="binary-test-stop-native-servers" value="true"/>
<option name="test-timeout" value="15m"/>
<!-- b/64734869: a known incompatibility with new tests (waiver) -->
- <option name="exclude-filter" value="VtsHalRadioV1_2Target#RadioHidlTest_v1_2.startNetworkScan_GoodRequest1" />
- <option name="exclude-filter" value="VtsHalRadioV1_2Target#RadioHidlTest_v1_2.startNetworkScan_GoodRequest2" />
+ <option name="exclude-filter" value="RadioHidlTest_v1_2.startNetworkScan_GoodRequest1" />
+ <option name="exclude-filter" value="RadioHidlTest_v1_2.startNetworkScan_GoodRequest2" />
</test>
</configuration>
diff --git a/soundtrigger/V2_1/adapter/Android.mk b/soundtrigger/V2_1/adapter/Android.mk
deleted file mode 100644
index cf1fbc7..0000000
--- a/soundtrigger/V2_1/adapter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2018 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 := VtsHalSoundtriggerV2_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/soundtrigger/V2_1/adapter
-include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/Android.mk b/soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/Android.mk
index abfb48d..dbdae0c 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalSoundtriggerV2_1AdapterCtsStatsdHostTestCases
include test/vts/tools/build/Android.host_config.mk
diff --git a/soundtrigger/V2_1/adapter/AndroidTest.xml b/soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
similarity index 95%
copy from soundtrigger/V2_1/adapter/AndroidTest.xml
copy to soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
index e292e96..fbc7de3 100644
--- a/soundtrigger/V2_1/adapter/AndroidTest.xml
+++ b/soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalSoundtriggerV2_1Adapter test cases">
+<configuration description="Config for VTS VtsHalSoundtriggerV2_1AdapterCtsStatsdHostTestCases test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
<object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
<option name="hal-package-name" value="android.hardware.soundtrigger@2.1"/>
@@ -27,5 +27,4 @@
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
</test>
<include name="CtsStatsdHostTestCases.config"/>
- <include name="CtsWidgetTestCases.config"/>
</configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/soundtrigger/V2_1/adapter/CtsWidgetTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to soundtrigger/V2_1/adapter/CtsWidgetTestCases/Android.mk
index abfb48d..5abee3f 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/soundtrigger/V2_1/adapter/CtsWidgetTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalSoundtriggerV2_1AdapterCtsWidgetTestCases
include test/vts/tools/build/Android.host_config.mk
diff --git a/soundtrigger/V2_1/adapter/AndroidTest.xml b/soundtrigger/V2_1/adapter/CtsWidgetTestCases/AndroidTest.xml
similarity index 95%
rename from soundtrigger/V2_1/adapter/AndroidTest.xml
rename to soundtrigger/V2_1/adapter/CtsWidgetTestCases/AndroidTest.xml
index e292e96..fef5747 100644
--- a/soundtrigger/V2_1/adapter/AndroidTest.xml
+++ b/soundtrigger/V2_1/adapter/CtsWidgetTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalSoundtriggerV2_1Adapter test cases">
+<configuration description="Config for VTS VtsHalSoundtriggerV2_1AdapterCtsWidgetTestCases test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
<object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
<option name="hal-package-name" value="android.hardware.soundtrigger@2.1"/>
@@ -26,6 +26,5 @@
<option name="package" value="com.android.devicehealth.tests"/>
<option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
</test>
- <include name="CtsStatsdHostTestCases.config"/>
<include name="CtsWidgetTestCases.config"/>
</configuration>
diff --git a/system/hidl/safe_union/V1_0/build/Android.bp b/system/hidl/safe_union/V1_0/build/Android.bp
index 2df9de8..1ccfef2 100644
--- a/system/hidl/safe_union/V1_0/build/Android.bp
+++ b/system/hidl/safe_union/V1_0/build/Android.bp
@@ -1,6 +1,3 @@
-// This file was auto-generated. Do not edit manually.
-// Use launch_hal_test.py or update_makefiles.py in test/vts-testcase/hal/script/ to generate this file.
-
// Generate .vts spec files.
hal2vts {
name: "android.hidl.safe_union@1.0-vts.spec",
