From f309b1ca4c18b0bfb3bf04ca6b24de56882fffe8 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Wed, 5 Feb 2025 17:30:33 +0000
Subject: [PATCH] Remove old unused VINTF manifest file

This file is out of date and unused, so remove it.
It's targeting Android R FCM and declaring old HIDL versions of HALs
that these devices do not use.

Test: m
Bug: 388074589
Change-Id: If3a8bc9b518ef8a042c3f93f1aa2bc939da9d43e
---
 aosp_husky.mk      |   3 --
 aosp_ripcurrent.mk |   3 --
 aosp_shiba.mk      |   3 --
 manifest.xml       | 116 ---------------------------------------------
 4 files changed, 125 deletions(-)
 delete mode 100644 manifest.xml

diff --git a/aosp_husky.mk b/aosp_husky.mk
index 47cf99b..6cd4ada 100644
--- a/aosp_husky.mk
+++ b/aosp_husky.mk
@@ -27,6 +27,3 @@ PRODUCT_DEVICE := husky
 PRODUCT_MODEL := AOSP on husky
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
-
-DEVICE_MANIFEST_FILE := \
-	device/google/shusky/manifest.xml
diff --git a/aosp_ripcurrent.mk b/aosp_ripcurrent.mk
index 4a6c484..2576e6d 100644
--- a/aosp_ripcurrent.mk
+++ b/aosp_ripcurrent.mk
@@ -27,6 +27,3 @@ PRODUCT_DEVICE := ripcurrent
 PRODUCT_MODEL := AOSP on ripcurrent
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
-
-DEVICE_MANIFEST_FILE := \
-	device/google/shusky/manifest.xml
diff --git a/aosp_shiba.mk b/aosp_shiba.mk
index f9ec72f..1b6cfd4 100644
--- a/aosp_shiba.mk
+++ b/aosp_shiba.mk
@@ -27,6 +27,3 @@ PRODUCT_DEVICE := shiba
 PRODUCT_MODEL := AOSP on shiba
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
-
-DEVICE_MANIFEST_FILE := \
-	device/google/shusky/manifest.xml
diff --git a/manifest.xml b/manifest.xml
deleted file mode 100644
index 18109c6..0000000
--- a/manifest.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<manifest version="1.0" type="device" target-level="5">
-   <hal format="hidl">
-        <name>android.hardware.audio</name>
-        <transport>hwbinder</transport>
-        <version>7.1</version>
-        <interface>
-            <name>IDevicesFactory</name>
-            <instance>default</instance>
-        </interface>
-   </hal>
-   <hal format="hidl">
-        <name>android.hardware.audio.effect</name>
-        <transport>hwbinder</transport>
-        <version>7.0</version>
-        <interface>
-            <name>IEffectsFactory</name>
-            <instance>default</instance>
-        </interface>
-   </hal>
-   <hal format="hidl">
-        <name>android.hardware.soundtrigger</name>
-        <transport>hwbinder</transport>
-        <version>2.3</version>
-        <interface>
-            <name>ISoundTriggerHw</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.media.omx</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOmx</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IOmxStore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.4</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.renderscript</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format = "hidl">
-        <name>android.hardware.dumpstate</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IDumpstateDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth.audio</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBluetoothAudioProvidersFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.boot</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::IBootControl/default</fqname>
-    </hal>
-    <hal format="hidl">
-       <name>android.hardware.neuralnetworks</name>
-       <transport>hwbinder</transport>
-       <fqname>@1.3::IDevice/google-edgetpu</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-       <name>vendor.google.whitechapel.audio.audioext</name>
-       <transport>hwbinder</transport>
-       <version>4.0</version>
-       <interface>
-           <name>IAudioExt</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
-    <kernel target-level="6"/>
-</manifest>