From 3895baa806475dd2345a076fd53b012c6b7add65 Mon Sep 17 00:00:00 2001
From: AdarshGrewal <adarshgrewal@gmail.com>
Date: Sun, 26 Oct 2025 15:37:55 +0530
Subject: [PATCH] garnet: Include audio manifests from source

Change-Id: I5a1e61869c4ea6d6c0fd128686d05f9f8a6f3ab8
---
 Android.bp                                    | 18 ------
 peridot-vendor.mk                             |  2 -
 .../etc/vintf/manifest/manifest_non_qmaa.xml  | 59 -------------------
 .../vintf/manifest/manifest_non_qmaa_extn.xml | 38 ------------
 4 files changed, 117 deletions(-)
 delete mode 100644 proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa.xml
 delete mode 100644 proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa_extn.xml

diff --git a/Android.bp b/Android.bp
index 64dd004..4f1562f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39684,24 +39684,6 @@ prebuilt_etc_xml {
     soc_specific: true,
 }
 
-prebuilt_etc_xml {
-    name: "manifest_non_qmaa.xml",
-    owner: "xiaomi",
-    src: "proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa.xml",
-    filename_from_src: true,
-    sub_dir: "vintf/manifest",
-    soc_specific: true,
-}
-
-prebuilt_etc_xml {
-    name: "manifest_non_qmaa_extn.xml",
-    owner: "xiaomi",
-    src: "proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa_extn.xml",
-    filename_from_src: true,
-    sub_dir: "vintf/manifest",
-    soc_specific: true,
-}
-
 prebuilt_etc_xml {
     name: "mwqem-saidl.xml",
     owner: "xiaomi",
diff --git a/peridot-vendor.mk b/peridot-vendor.mk
index 485241c..8fe8f32 100644
--- a/peridot-vendor.mk
+++ b/peridot-vendor.mk
@@ -2448,8 +2448,6 @@ PRODUCT_PACKAGES += \
     deviceinfo-saidl.xml \
     dpm-saidl.xml \
     imsdcservice-saidl.xml \
-    manifest_non_qmaa.xml \
-    manifest_non_qmaa_extn.xml \
     mwqem-saidl.xml \
     qcrilhook-saidl.xml \
     qesdk-manager.xml \
diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa.xml b/proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa.xml
deleted file mode 100644
index c23cd6a..0000000
--- a/proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- Copyright (c)  2021 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="hidl">
-        <name>android.hardware.soundtrigger</name>
-        <transport>hwbinder</transport>
-        <version>2.3</version>
-        <interface>
-            <name>ISoundTriggerHw</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <!-- AGM service-->
-    <hal format="hidl">
-        <name>vendor.qti.hardware.AGMIPC</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IAGM</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <!-- Audio PAL service -->
-    <hal format="hidl">
-        <name>vendor.qti.hardware.pal</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IPAL</name>
-            <instance>default</instance>
-            </interface>
-        <fqname>@1.0::IPAL/default</fqname>
-    </hal>
-</manifest>
diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa_extn.xml b/proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa_extn.xml
deleted file mode 100644
index 9db37e0..0000000
--- a/proprietary/vendor/etc/vintf/manifest/manifest_non_qmaa_extn.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- Copyright (c)  2021 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="hidl">
-        <name>vendor.qti.hardware.ListenSoundModel</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IListenSoundModel</name>
-            <instance>default</instance>
-            </interface>
-    </hal>
-</manifest>