From 311f36f61925a9137541b96e68388244bd5796c7 Mon Sep 17 00:00:00 2001
From: Marc Bourgoin <themard85@gmail.com>
Date: Mon, 8 Jul 2024 20:17:22 -0600
Subject: [PATCH] zippo: Commonize audio HAL version

Change-Id: I2c18424345699331b000b51c25ca2eecb5bf82db
---
 device.mk    |  6 +-----
 manifest.xml | 18 ------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/device.mk b/device.mk
index 6a56d79..a8a62cd 100644
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2021 The LineageOS Project
+# Copyright (C) 2019-2024 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -17,10 +17,6 @@ PRODUCT_PACKAGES += \
     FaceUnlockService
 
 # Audio
-PRODUCT_PACKAGES += \
-    android.hardware.audio@6.0-impl \
-    android.hardware.audio.effect@6.0-impl \
-
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \
     $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml
diff --git a/manifest.xml b/manifest.xml
index 55a56d2..cf304b2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,22 +1,4 @@
 <manifest version="2.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.audio</name>
-        <transport>hwbinder</transport>
-        <version>6.0</version>
-        <interface>
-            <name>IDevicesFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.audio.effect</name>
-        <transport>hwbinder</transport>
-        <version>6.0</version>
-        <interface>
-            <name>IEffectsFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>vendor.goodix.hardware.biometrics.fingerprint</name>
         <transport>hwbinder</transport>