Merge "audio: Remove audio effects config from audio HAL VAPEX" into main
diff --git a/audio/aidl/default/Android.bp b/audio/aidl/default/Android.bp
index 8c6c537..fc82a65 100644
--- a/audio/aidl/default/Android.bp
+++ b/audio/aidl/default/Android.bp
@@ -245,7 +245,7 @@
"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 @@
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 2ece7a1..ee7e46e 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 @@
prebuilts: [
"android.hardware.audio.service-aidl.example.rc",
"android.hardware.audio.service-aidl.xml",
- "audio_effects_config.xml",
],
}