Merge "Move offload spatializer config to device-specific folder." into 24D1-dev

audio/caiman/audio-tables.mk

@@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
     device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
 
 endif
+
+# Offload spatializer config
+PRODUCT_PACKAGES += \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

audio/caiman/tuning/Android.bp

@@ -128,3 +128,35 @@ prebuilt_etc {
     src: "waves/tests/test_preset.mps",
     soc_specific: true,
 }
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
+    src: "spatializer/base",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
+    src: "spatializer/mode_2_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
+    src: "spatializer/mode_6_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
+    src: "spatializer/mode_xaural",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}

audio/komodo/audio-tables.mk

@@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
     device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
 
 endif
+
+# Offload spatializer config
+PRODUCT_PACKAGES += \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

audio/komodo/tuning/Android.bp

@@ -128,3 +128,35 @@ prebuilt_etc {
     src: "waves/tests/test_preset.mps",
     soc_specific: true,
 }
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
+    src: "spatializer/base",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
+    src: "spatializer/mode_2_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
+    src: "spatializer/mode_6_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
+    src: "spatializer/mode_xaural",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}

audio/tokay/audio-tables.mk

@@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
     device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
 
 endif
+
+# Offload spatializer config
+PRODUCT_PACKAGES += \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

audio/tokay/tuning/Android.bp

@@ -128,3 +128,35 @@ prebuilt_etc {
     src: "waves/tests/test_preset.mps",
     soc_specific: true,
 }
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
+    src: "spatializer/base",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
+    src: "spatializer/mode_2_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
+    src: "spatializer/mode_6_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
+    src: "spatializer/mode_xaural",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}