From 07bbadb3e39e59bb707ea4379712cfb6ca3e2f55 Mon Sep 17 00:00:00 2001
From: Mikhail Naganov <mnaganov@google.com>
Date: Wed, 21 Feb 2024 11:32:32 -0800
Subject: [PATCH] audio: Remove audio effects config from audio HAL VAPEX

The audio effects HAL config can vary between different
CF "flavors" and thus must not belong to VAPEX. This is
consistent with handling of audio policy configuration files.

Bug: 318423731
Test: run `atest audioeffect_tests` on cf_x86_64_auto-trunk_staging-userdebug
Change-Id: I0f4ee9a44a3426934f6a055fc8c9ce74a8db78fc
---
 audio/aidl/default/Android.bp                             | 8 +-------
 .../default/apex/com.android.hardware.audio/Android.bp    | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/audio/aidl/default/Android.bp b/audio/aidl/default/Android.bp
index 8c6c537359..fc82a65e95 100644
--- a/audio/aidl/default/Android.bp
+++ b/audio/aidl/default/Android.bp
@@ -245,7 +245,7 @@ cc_binary {
         "EffectFactory.cpp",
         "EffectMain.cpp",
     ],
-    installable: false, //installed in apex com.android.hardware.audio.effect
+    installable: false, //installed in apex com.android.hardware.audio
 }
 
 cc_library_headers {
@@ -267,9 +267,3 @@ prebuilt_etc {
     sub_dir: "vintf",
     installable: false,
 }
-
-prebuilt_etc {
-    name: "audio_effects_config.xml",
-    src: "audio_effects_config.xml",
-    installable: false,
-}
diff --git a/audio/aidl/default/apex/com.android.hardware.audio/Android.bp b/audio/aidl/default/apex/com.android.hardware.audio/Android.bp
index 2ece7a1929..ee7e46edce 100644
--- a/audio/aidl/default/apex/com.android.hardware.audio/Android.bp
+++ b/audio/aidl/default/apex/com.android.hardware.audio/Android.bp
@@ -46,6 +46,5 @@ apex {
     prebuilts: [
         "android.hardware.audio.service-aidl.example.rc",
         "android.hardware.audio.service-aidl.xml",
-        "audio_effects_config.xml",
     ],
 }