diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 7be62499fbd7fe00d9e2a989441b54ccacfa8ffe..ce46a04276dbeab4e88d88318f32039303aaf816 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -134,7 +134,6 @@ DEVICE_MANIFEST_FILE := \
$(COMMON_PATH)/manifests/AHBF@2.1-service.xml \
$(COMMON_PATH)/manifests/android.hardware.atrace@1.0-service.xml \
$(COMMON_PATH)/manifests/android.hardware.boot@1.1.xml \
- $(COMMON_PATH)/manifests/android.hardware.cas@1.2-service.xml \
$(COMMON_PATH)/manifests/android.hardware.dumpstate@1.1-service.xiaomi.xml \
$(COMMON_PATH)/manifests/android.hardware.gnss@2.1-service-qti.xml \
$(COMMON_PATH)/manifests/android.hardware.graphics.mapper-impl-qti-display.xml \
@@ -142,11 +141,8 @@ DEVICE_MANIFEST_FILE := \
$(COMMON_PATH)/manifests/android.hardware.ir@1.0-service.xml \
$(COMMON_PATH)/manifests/android.hardware.lights-qti.xml \
$(COMMON_PATH)/manifests/android.hardware.neuralnetworks@1.3-service-qti.xml \
- $(COMMON_PATH)/manifests/android.hardware.sensors@2.0-multihal.xml \
$(COMMON_PATH)/manifests/android.hardware.thermal@2.0-service.qti.xml \
$(COMMON_PATH)/manifests/android.hardware.usb@1.2-service.xml \
- $(COMMON_PATH)/manifests/android.hardware.wifi.hostapd.xml \
- $(COMMON_PATH)/manifests/android.hardware.wifi@1.0-service.xml \
$(COMMON_PATH)/manifests/c2_manifest_vendor.xml \
$(COMMON_PATH)/manifests/fod.xml \
$(COMMON_PATH)/manifests/manifest_android.hardware.drm@1.3-service.clearkey.xml \
@@ -164,7 +160,6 @@ DEVICE_MANIFEST_FILE := \
$(COMMON_PATH)/manifests/vendor.qti.hardware.display.allocator-service.xml \
$(COMMON_PATH)/manifests/vendor.qti.hardware.display.composer-service.xml \
$(COMMON_PATH)/manifests/vendor.qti.hardware.servicetracker@1.2-service.xml \
- $(COMMON_PATH)/manifests/vendor.qti.hardware.vibrator.service.xml \
$(COMMON_PATH)/manifests/vendor.xiaomi.cit.bluetooth@1.0_manifest.xml \
$(COMMON_PATH)/manifests/vendor.xiaomi.cit.wifi@1.0_manifest.xml \
$(COMMON_PATH)/manifests/vendor.xiaomi.hardware.citsensorservice@1.1-service.xml \
diff --git a/manifests/android.hardware.cas@1.2-service.xml b/manifests/android.hardware.cas@1.2-service.xml
deleted file mode 100644
index 9b36406055cf45c88bdb71a4c6c9aeda2ab4abab..0000000000000000000000000000000000000000
--- a/manifests/android.hardware.cas@1.2-service.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
- <hal format="hidl">
- <name>android.hardware.cas</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>IMediaCasService</name>
- <instance>default</instance>
- </interface>
- </hal>
-</manifest>
diff --git a/manifests/android.hardware.sensors@2.0-multihal.xml b/manifests/android.hardware.sensors@2.0-multihal.xml
deleted file mode 100644
index 1acc8e6113fc569748daabe1638da4d6dd542b27..0000000000000000000000000000000000000000
--- a/manifests/android.hardware.sensors@2.0-multihal.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
- <hal format="hidl">
- <name>android.hardware.sensors</name>
- <transport>hwbinder</transport>
- <version>2.0</version>
- <interface>
- <name>ISensors</name>
- <instance>default</instance>
- </interface>
- </hal>
-</manifest>
diff --git a/manifests/android.hardware.wifi.hostapd.xml b/manifests/android.hardware.wifi.hostapd.xml
deleted file mode 100644
index 309c3cd25ef565236718053ada8c6386a7e2fe72..0000000000000000000000000000000000000000
--- a/manifests/android.hardware.wifi.hostapd.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<manifest version="1.0" type="device">
- <hal format="hidl">
- <name>android.hardware.wifi.hostapd</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>IHostapd</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>vendor.qti.hardware.wifi.hostapd</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>IHostapdVendor</name>
- <instance>default</instance>
- </interface>
- </hal>
-</manifest>
diff --git a/manifests/android.hardware.wifi@1.0-service.xml b/manifests/android.hardware.wifi@1.0-service.xml
deleted file mode 100644
index b5d25cd140352550b14b48a2b2bd332060898b90..0000000000000000000000000000000000000000
--- a/manifests/android.hardware.wifi@1.0-service.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
- <hal format="hidl">
- <name>android.hardware.wifi</name>
- <transport>hwbinder</transport>
- <version>1.4</version>
- <interface>
- <name>IWifi</name>
- <instance>default</instance>
- </interface>
- </hal>
-</manifest>
diff --git a/manifests/vendor.qti.hardware.vibrator.service.xml b/manifests/vendor.qti.hardware.vibrator.service.xml
deleted file mode 100644
index df29ada425f304ead2bafef2fc26521ca2571a9e..0000000000000000000000000000000000000000
--- a/manifests/vendor.qti.hardware.vibrator.service.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- Copyright (c) 2020 The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<manifest version="1.0" type="device">
- <hal format="aidl">
- <name>android.hardware.vibrator</name>
- <fqname>IVibrator/default</fqname>
- </hal>
-</manifest>