Merge "Delete HALs that are already in VINTF fragments (android.hardware.*)"
diff --git a/manifest.xml b/manifest.xml
index fb723e4..823da5c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -403,16 +403,12 @@
         <name>android.hardware.neuralnetworks</name>
         <transport>hwbinder</transport>
         <fqname>@1.2::IDevice/google-edgetpu</fqname>
-        <fqname>@1.3::IDevice/qti-default</fqname>
-        <fqname>@1.3::IDevice/qti-dsp</fqname>
-        <fqname>@1.3::IDevice/qti-gpu</fqname>
     </hal>
     <!-- keymaster -->
     <hal format="hidl">
        <name>android.hardware.keymaster</name>
        <transport>hwbinder</transport>
        <fqname>@4.0::IKeymasterDevice/default</fqname>
-       <fqname>@4.1::IKeymasterDevice/strongbox</fqname>
      </hal>
      <hal format="hidl">
         <name>android.hardware.power.stats</name>
@@ -461,15 +457,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.weaver</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IWeaver</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.dumpstate</name>
         <transport>hwbinder</transport>
         <version>1.1</version>
@@ -497,24 +484,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.oemlock</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOemLock</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.authsecret</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IAuthSecret</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>vendor.qti.hardware.cacert</name>
         <transport>hwbinder</transport>
         <version>1.0</version>