Fix radio 1.1 adapter test using CTS-on-GSI
Test: make
Bug: 124135282
Merged-In: Id99c1cb445429f1a38d8219d7c1604f903c17d33
Change-Id: Id99c1cb445429f1a38d8219d7c1604f903c17d33
Fix: 124135282
diff --git a/radio/V1_1/adapter/Android.mk b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/Android.mk
similarity index 88%
rename from radio/V1_1/adapter/Android.mk
rename to radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/Android.mk
index 52e4a0e..041476d 100644
--- a/radio/V1_1/adapter/Android.mk
+++ b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalRadioV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/radio/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/radio/V1_1/adapter/Android.mk b/radio/V1_1/adapter/CtsJobSchedulerTestCases/Android.mk
similarity index 88%
copy from radio/V1_1/adapter/Android.mk
copy to radio/V1_1/adapter/CtsJobSchedulerTestCases/Android.mk
index 52e4a0e..208c0c3 100644
--- a/radio/V1_1/adapter/Android.mk
+++ b/radio/V1_1/adapter/CtsJobSchedulerTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalRadioV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/radio/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/radio/V1_1/adapter/Android.mk b/radio/V1_1/adapter/CtsTelephonyTestCases/Android.mk
similarity index 88%
copy from radio/V1_1/adapter/Android.mk
copy to radio/V1_1/adapter/CtsTelephonyTestCases/Android.mk
index 52e4a0e..805f949 100644
--- a/radio/V1_1/adapter/Android.mk
+++ b/radio/V1_1/adapter/CtsTelephonyTestCases/Android.mk
@@ -18,6 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsHalRadioV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/radio/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>