Merge "audio: Remove audio effects config from audio HAL VAPEX" into main am: e00f10e0a5 am: ca403bcd92
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2972254
Change-Id: I2293d35a285d965839af5836c00eefba5474286b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/Android.bp b/audio/aidl/default/Android.bp
index 41fc80b..844f1e9 100644
--- a/audio/aidl/default/Android.bp
+++ b/audio/aidl/default/Android.bp
@@ -249,7 +249,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 {
@@ -271,9 +271,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",
],
}