Fix gnss 1.1 adapter test using CTS-on-GSI
Test: make
Bug: 124135237
Merged-In: Id94cfc0b72491c0411d100374d5f6067bdda2c5b
Change-Id: Id94cfc0b72491c0411d100374d5f6067bdda2c5b
Fix: 124135237
diff --git a/gnss/V1_1/adapter/Android.mk b/gnss/V1_1/adapter/CtsLocationTestCases/Android.mk
similarity index 88%
rename from gnss/V1_1/adapter/Android.mk
rename 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>