Remove empty module end-to-end tests

Test: presubmit
Merged-In: I813428d71674e7a8e19f2f2476b9bfa5546c7b72
Change-Id: I813428d71674e7a8e19f2f2476b9bfa5546c7b72
(cherry picked from commit 664429cc85e10450c000cf32f0062ecd0d656a58)

24 files changed, 0 insertions, 797 deletions

diff --git a/tests/Android.bp b/tests/Android.bp
index 3494c852..45ea5cdc 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -24,17 +24,6 @@ java_defaults {
 }
 
 java_test_host {
-    name: "adbd_e2e_tests",
-    srcs:  ["src/**/AdbdHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.adbd",
-    ],
-    test_config: "adbd-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
     name: "timezone_data_e2e_tests",
     srcs:  ["src/**/TimezoneDataHostTest.java"],
     defaults: ["apex_e2e_test_defaults"],
@@ -49,17 +38,6 @@ java_test_host {
 }
 
 java_test_host {
-    name: "statsd_e2e_tests",
-    srcs:  ["src/**/StatsdHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.os.statsd",
-    ],
-    test_config: "statsd-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
     name: "media_e2e_tests",
     srcs:  ["src/**/MediaHostTest.java"],
     defaults: ["apex_e2e_test_defaults"],
@@ -82,106 +60,6 @@ java_test_host {
 }
 
 java_test_host {
-    name: "mediaprovider_e2e_tests",
-    srcs:  ["src/**/MediaProviderHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.mediaprovider",
-    ],
-    test_config: "mediaprovider-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
-    name: "conscrypt_e2e_tests",
-    srcs:  ["src/**/ConscryptHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.conscrypt",
-    ],
-    test_config: "conscrypt-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
-    name: "neuralnetworks_e2e_tests",
-    srcs:  ["src/**/NeuralNetworksHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.neuralnetworks",
-    ],
-    test_config: "neuralnetworks-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-
-java_test_host {
-    name: "cellbroadcast_e2e_tests",
-    srcs:  ["src/**/CellbroadcastHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.cellbroadcast",
-    ],
-    test_config: "cellbroadcast-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
-    name: "ipsec_e2e_tests",
-    srcs:  ["src/**/IpSecHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.ipsec",
-    ],
-    test_config: "ipsec-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
-    name: "cronet_e2e_tests",
-    srcs:  ["src/**/CronetHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.cronet",
-    ],
-    test_config: "cronet-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
-    name: "permission_e2e_tests",
-    srcs:  ["src/**/PermissionHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.permission",
-    ],
-    test_config: "permission-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
-    name: "wifi_e2e_tests",
-    srcs:  ["src/**/WifiHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.wifi",
-    ],
-    test_config: "wifi-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
-    name: "extservices_e2e_tests",
-    srcs:  ["src/**/ExtServicesHostTest.java"],
-    defaults: ["apex_e2e_test_defaults"],
-    data: [
-        ":test_com.android.extservices",
-    ],
-    test_config: "extservices-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
     name: "apex_targetprep_tests",
     libs: ["tradefed"],
     srcs:  ["src/**/ApexTargetPrepTest.java"],
diff --git a/tests/TEST_MAPPING b/tests/TEST_MAPPING
index eb13cbad..6fdce6ef 100644
--- a/tests/TEST_MAPPING
+++ b/tests/TEST_MAPPING
@@ -7,46 +7,10 @@
       "name": "apex_targetprep_tests"
     },
     {
-      "name": "adbd_e2e_tests"
-    },
-    {
-      "name": "apexd_host_tests"
-    },
-    {
-      "name": "conscrypt_e2e_tests"
-    },
-    {
-      "name": "cronet_e2e_tests"
-    },
-    {
-      "name": "extservices_e2e_tests"
-    },
-    {
-      "name": "neuralnetworks_e2e_tests"
-    },
-    {
-      "name": "permission_e2e_tests"
-    },
-    {
       "name": "sdkextensions_e2e_tests"
     },
     {
-      "name": "statsd_e2e_tests"
-    },
-    {
       "name": "timezone_data_e2e_tests"
-    },
-    {
-      "name": "ipsec_e2e_tests"
-    },
-    {
-      "name": "wifi_e2e_tests"
-    },
-    {
-      "name": "mediaprovider_e2e_tests"
-    },
-    {
-      "name": "cellbroadcast_e2e_tests"
     }
   ],
   "postsubmit": [
@@ -60,53 +24,6 @@
     {
       "name": "media_swcodec_e2e_tests",
       "keywords": ["primary-device"]
-    },
-    // The following changes are in post-submit to restrict to physical
-    // devices (currently userspace reboot fails on cuttlefish).
-    // TODO(b/147726967): Remove when Userspace reboot works on cuttlefish
-    {
-      "name": "adbd_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "conscrypt_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "extservices_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "neuralnetworks_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "permission_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "sdkextensions_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "timezone_data_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "ipsec_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "wifi_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "mediaprovider_e2e_tests",
-      "keywords": ["primary-device"]
-    },
-    {
-      "name": "cellbroadcast_e2e_tests",
-      "keywords": ["primary-device"]
     }
   ],
   "imports": [
diff --git a/tests/adbd-e2e-tests.xml b/tests/adbd-e2e-tests.xml
deleted file mode 100644
index a144d834..00000000
--- a/tests/adbd-e2e-tests.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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="Configuration for adbd module e2e tests">
-    <option name="test-suite-tag" value="adbd_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="adbd_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.adbd.apex" />
-    </test>
-</configuration>
diff --git a/tests/cellbroadcast-e2e-tests.xml b/tests/cellbroadcast-e2e-tests.xml
deleted file mode 100644
index 368a88fa..00000000
--- a/tests/cellbroadcast-e2e-tests.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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 Cellbroadcast module e2e test cases">
-    <option name="test-suite-tag" value="cellbroadcast_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="cellbroadcast_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.cellbroadcast.apex" />
-    </test>
-</configuration>
\ No newline at end of file
diff --git a/tests/conscrypt-e2e-tests.xml b/tests/conscrypt-e2e-tests.xml
deleted file mode 100644
index 77f781a2..00000000
--- a/tests/conscrypt-e2e-tests.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 Conscrypt module e2e test cases">
-    <option name="test-suite-tag" value="conscrypt_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="conscrypt_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.conscrypt.apex" />
-    </test>
-</configuration>
-
diff --git a/tests/cronet-e2e-tests.xml b/tests/cronet-e2e-tests.xml
deleted file mode 100644
index 0cb5645b..00000000
--- a/tests/cronet-e2e-tests.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 cronet module e2e testing">
-    <option name="test-suite-tag" value="cronet_e2e_test" />
-    <option name="test-suite-tag" value="apct" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="cronet_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.cronet.apex" />
-    </test>
-</configuration>
-
diff --git a/tests/extservices-e2e-tests.xml b/tests/extservices-e2e-tests.xml
deleted file mode 100644
index c45392e6..00000000
--- a/tests/extservices-e2e-tests.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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 extservices apex e2e testing">
-    <option name="test-suite-tag" value="extservices_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="extservices_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.extservices.apex" />
-    </test>
-</configuration>
diff --git a/tests/ipsec-e2e-tests.xml b/tests/ipsec-e2e-tests.xml
deleted file mode 100644
index 0030bd34..00000000
--- a/tests/ipsec-e2e-tests.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 ipsec module e2e testing">
-    <option name="test-suite-tag" value="ipsec_e2e_test" />
-    <option name="test-suite-tag" value="apct" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="ipsec_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.ipsec.apex" />
-    </test>
-</configuration>
-
diff --git a/tests/mediaprovider-e2e-tests.xml b/tests/mediaprovider-e2e-tests.xml
deleted file mode 100644
index e1212622..00000000
--- a/tests/mediaprovider-e2e-tests.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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 MediaProvider module e2e test cases">
-    <option name="test-suite-tag" value="mediaprovider_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="mediaprovider_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.mediaprovider.apex" />
-    </test>
-</configuration>
diff --git a/tests/neuralnetworks-e2e-tests.xml b/tests/neuralnetworks-e2e-tests.xml
deleted file mode 100644
index 63c38a68..00000000
--- a/tests/neuralnetworks-e2e-tests.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 neuralnetworks module e2e test cases">
-    <option name="test-suite-tag" value="neuralnetworks_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="neuralnetworks_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.neuralnetworks.apex" />
-    </test>
-</configuration>
-
diff --git a/tests/permission-e2e-tests.xml b/tests/permission-e2e-tests.xml
deleted file mode 100644
index e1605abe..00000000
--- a/tests/permission-e2e-tests.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- 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.
--->
-
-<configuration description="Configuration for permission module e2e test cases">
-    <option name="test-suite-tag" value="permission_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="permission_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.permission.apex" />
-    </test>
-</configuration>
diff --git a/tests/src/com/android/tests/apex/AdbdHostTest.java b/tests/src/com/android/tests/apex/AdbdHostTest.java
deleted file mode 100644
index 445ca88b..00000000
--- a/tests/src/com/android/tests/apex/AdbdHostTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2020 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-@Ignore // TODO(b/148759193): remove when test is fixed
-public class AdbdHostTest extends ApexE2EBaseHostTest {
-}
diff --git a/tests/src/com/android/tests/apex/CellbroadcastHostTest.java b/tests/src/com/android/tests/apex/CellbroadcastHostTest.java
deleted file mode 100644
index 97230422..00000000
--- a/tests/src/com/android/tests/apex/CellbroadcastHostTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class CellbroadcastHostTest extends ApexE2EBaseHostTest {
-}
\ No newline at end of file
diff --git a/tests/src/com/android/tests/apex/ConscryptHostTest.java b/tests/src/com/android/tests/apex/ConscryptHostTest.java
deleted file mode 100644
index 01cb840e..00000000
--- a/tests/src/com/android/tests/apex/ConscryptHostTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class ConscryptHostTest extends ApexE2EBaseHostTest {
-}
diff --git a/tests/src/com/android/tests/apex/CronetHostTest.java b/tests/src/com/android/tests/apex/CronetHostTest.java
deleted file mode 100644
index bea36e03..00000000
--- a/tests/src/com/android/tests/apex/CronetHostTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class CronetHostTest extends ApexE2EBaseHostTest {
-}
diff --git a/tests/src/com/android/tests/apex/ExtServicesHostTest.java b/tests/src/com/android/tests/apex/ExtServicesHostTest.java
deleted file mode 100644
index ff5d6942..00000000
--- a/tests/src/com/android/tests/apex/ExtServicesHostTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2020 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class ExtServicesHostTest extends ApexE2EBaseHostTest {
-}
diff --git a/tests/src/com/android/tests/apex/IpSecHostTest.java b/tests/src/com/android/tests/apex/IpSecHostTest.java
deleted file mode 100644
index 765f4355..00000000
--- a/tests/src/com/android/tests/apex/IpSecHostTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.runner.RunWith;
-
-/** Test to check if Apex can be staged, activated and uninstalled successfully. */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class IpSecHostTest extends ApexE2EBaseHostTest {
-}
diff --git a/tests/src/com/android/tests/apex/MediaProviderHostTest.java b/tests/src/com/android/tests/apex/MediaProviderHostTest.java
deleted file mode 100644
index 4fc72251..00000000
--- a/tests/src/com/android/tests/apex/MediaProviderHostTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class MediaProviderHostTest extends ApexE2EBaseHostTest {
-}
diff --git a/tests/src/com/android/tests/apex/NeuralNetworksHostTest.java b/tests/src/com/android/tests/apex/NeuralNetworksHostTest.java
deleted file mode 100644
index 1effbe2a..00000000
--- a/tests/src/com/android/tests/apex/NeuralNetworksHostTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class NeuralNetworksHostTest extends ApexE2EBaseHostTest {
-}
diff --git a/tests/src/com/android/tests/apex/PermissionHostTest.java b/tests/src/com/android/tests/apex/PermissionHostTest.java
deleted file mode 100644
index c673ade9..00000000
--- a/tests/src/com/android/tests/apex/PermissionHostTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@Ignore("b/152717947")
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class PermissionHostTest extends ApexE2EBaseHostTest {
-}
diff --git a/tests/src/com/android/tests/apex/StatsdHostTest.java b/tests/src/com/android/tests/apex/StatsdHostTest.java
deleted file mode 100644
index 4ad3bb8d..00000000
--- a/tests/src/com/android/tests/apex/StatsdHostTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-@Ignore // TODO(b/150452752): unignore when test is fixed.
-public class StatsdHostTest extends ApexE2EBaseHostTest {
-}
diff --git a/tests/src/com/android/tests/apex/WifiHostTest.java b/tests/src/com/android/tests/apex/WifiHostTest.java
deleted file mode 100644
index 7fd85289..00000000
--- a/tests/src/com/android/tests/apex/WifiHostTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.tests.apex;
-
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-
-import org.junit.runner.RunWith;
-
-/**
- * Test to check if Apex can be staged, activated and uninstalled successfully.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class WifiHostTest extends ApexE2EBaseHostTest {
-    // TODO(b/146163587): Add more checks to verify apex installation.
-}
diff --git a/tests/statsd-e2e-tests.xml b/tests/statsd-e2e-tests.xml
deleted file mode 100644
index b3a270ce..00000000
--- a/tests/statsd-e2e-tests.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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="Configuration for statsd module e2e test cases">
-    <option name="test-suite-tag" value="statsd_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="statsd_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.os.statsd.apex" />
-    </test>
-</configuration>
diff --git a/tests/wifi-e2e-tests.xml b/tests/wifi-e2e-tests.xml
deleted file mode 100644
index 1a130962..00000000
--- a/tests/wifi-e2e-tests.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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 wifi apex e2e testing">
-    <option name="test-suite-tag" value="wifi_e2e_tests" />
-    <option name="test-suite-tag" value="apct" />
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="jar" value="wifi_e2e_tests.jar" />
-        <option name="set-option" value="apex_file_name:test_com.android.wifi.apex" />
-    </test>
-</configuration>
-