Snap for 12199973 from 644e60f4dc to 24Q4-release

Change-Id: Icb602b572b9e5d3f92bc3add12d3572d64d46b83

AndroidProducts.mk

@@ -16,9 +16,11 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_caiman.mk \
+    $(LOCAL_DIR)/aosp_caiman_16k.mk \
     $(LOCAL_DIR)/aosp_caiman_fullmte.mk \
     $(LOCAL_DIR)/factory_caiman.mk \
     $(LOCAL_DIR)/aosp_komodo.mk \
+    $(LOCAL_DIR)/aosp_komodo_16k.mk \
     $(LOCAL_DIR)/aosp_komodo_fullmte.mk \
     $(LOCAL_DIR)/factory_komodo.mk \
     $(LOCAL_DIR)/aosp_ripcurrentpro.mk \
@@ -28,6 +30,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_ripcurrent24_fullmte.mk \
     $(LOCAL_DIR)/factory_ripcurrent24.mk \
     $(LOCAL_DIR)/aosp_tokay.mk \
+    $(LOCAL_DIR)/aosp_tokay_16k.mk \
     $(LOCAL_DIR)/aosp_tokay_fullmte.mk \
     $(LOCAL_DIR)/factory_tokay.mk
 COMMON_LUNCH_CHOICES := \

aosp_caiman_16k.mk

@@ -0,0 +1,7 @@
+$(call inherit-product, device/google/caimito/aosp_caiman.mk)
+
+PRODUCT_NAME := aosp_caiman_16k
+
+TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
+TARGET_BOOTS_16K := true

aosp_komodo_16k.mk

@@ -0,0 +1,7 @@
+$(call inherit-product, device/google/caimito/aosp_komodo.mk)
+
+PRODUCT_NAME := aosp_komodo_16k
+
+TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
+TARGET_BOOTS_16K := true

aosp_tokay_16k.mk

@@ -0,0 +1,7 @@
+$(call inherit-product, device/google/caimito/aosp_tokay.mk)
+
+PRODUCT_NAME := aosp_tokay_16k
+
+TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
+TARGET_BOOTS_16K := true

audio/caiman/audio-tables.mk

@@ -62,7 +62,25 @@ PRODUCT_PACKAGES += \
     waves_preset.mps \
     compens_spk_l.conf \
     compens_spk_r.conf \
-    default_mic_compensation.bin
+    default_mic_compensation.bin \
+    downlink_bluetooth_headset_config.pb \
+    downlink_dock_config.pb \
+    downlink_external_speaker_config.pb \
+    downlink_handset_config.pb \
+    downlink_speaker_config.pb \
+    downlink_wired_headset_config.pb \
+    uplink_bluetooth_headset_aec_off_config.pb \
+    uplink_bluetooth_headset_aec_on_config.pb \
+    uplink_dock_aec_off_config.pb \
+    uplink_dock_aec_on_config.pb \
+    uplink_external_speaker_aec_off_config.pb \
+    uplink_external_speaker_aec_on_config.pb \
+    uplink_handset_aec_off_config.pb \
+    uplink_handset_aec_on_config.pb \
+    uplink_speaker_aec_off_config.pb \
+    uplink_speaker_aec_on_config.pb \
+    uplink_wired_headset_aec_off_config.pb \
+    uplink_wired_headset_aec_on_config.pb
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \

audio/caiman/tuning/Android.bp

@@ -35,16 +35,19 @@ prebuilt_etc {
     src: "bluenote/recording.gatf",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "smartfeature.gstf",
     src: "bluenote/smartfeature.gstf",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "template.xml",
     src: "bluenote/template.xml",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "tuning_constraints_combination.xml",
     src: "bluenote/tuning_constraints_combination.xml",
@@ -56,6 +59,7 @@ prebuilt_etc {
     src: "compensation/compens_spk_l.conf",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "compens_spk_r.conf",
     src: "compensation/compens_spk_r.conf",
@@ -67,62 +71,181 @@ prebuilt_etc {
     src: "fortemedia/BLUETOOTH.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "BLUETOOTH.mods",
     src: "fortemedia/BLUETOOTH.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSFREE.dat",
     src: "fortemedia/HANDSFREE.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSFREE.mods",
     src: "fortemedia/HANDSFREE.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSET.dat",
     src: "fortemedia/HANDSET.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSET.mods",
     src: "fortemedia/HANDSET.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HEADSET.dat",
     src: "fortemedia/HEADSET.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HEADSET.mods",
     src: "fortemedia/HEADSET.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "mcps.dat",
     src: "fortemedia/mcps.dat",
     defaults: ["aoc_defaults"],
 }
 
+prebuilt_etc {
+    name: "downlink_bluetooth_headset_config.pb",
+    src: "apmg3/downlink_bluetooth_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_dock_config.pb",
+    src: "apmg3/downlink_dock_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_external_speaker_config.pb",
+    src: "apmg3/downlink_external_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_handset_config.pb",
+    src: "apmg3/downlink_handset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_speaker_config.pb",
+    src: "apmg3/downlink_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_wired_headset_config.pb",
+    src: "apmg3/downlink_wired_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_off_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_on_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_off_config.pb",
+    src: "apmg3/uplink_dock_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_on_config.pb",
+    src: "apmg3/uplink_dock_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_off_config.pb",
+    src: "apmg3/uplink_handset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_on_config.pb",
+    src: "apmg3/uplink_handset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_off_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_on_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "waves_config.ini",
     src: "waves/waves_config.ini",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "waves_preset.mps",
     src: "waves/waves_preset.mps",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "test_config.ini",
     src: "waves/tests/test_config.ini",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "test_preset.mps",
     src: "waves/tests/test_preset.mps",

audio/komodo/audio-tables.mk

@@ -62,7 +62,25 @@ PRODUCT_PACKAGES += \
     waves_preset.mps \
     compens_spk_l.conf \
     compens_spk_r.conf \
-    default_mic_compensation.bin
+    default_mic_compensation.bin \
+    downlink_bluetooth_headset_config.pb \
+    downlink_dock_config.pb \
+    downlink_external_speaker_config.pb \
+    downlink_handset_config.pb \
+    downlink_speaker_config.pb \
+    downlink_wired_headset_config.pb \
+    uplink_bluetooth_headset_aec_off_config.pb \
+    uplink_bluetooth_headset_aec_on_config.pb \
+    uplink_dock_aec_off_config.pb \
+    uplink_dock_aec_on_config.pb \
+    uplink_external_speaker_aec_off_config.pb \
+    uplink_external_speaker_aec_on_config.pb \
+    uplink_handset_aec_off_config.pb \
+    uplink_handset_aec_on_config.pb \
+    uplink_speaker_aec_off_config.pb \
+    uplink_speaker_aec_on_config.pb \
+    uplink_wired_headset_aec_off_config.pb \
+    uplink_wired_headset_aec_on_config.pb
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \

audio/komodo/tuning/Android.bp

@@ -35,16 +35,19 @@ prebuilt_etc {
     src: "bluenote/recording.gatf",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "smartfeature.gstf",
     src: "bluenote/smartfeature.gstf",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "template.xml",
     src: "bluenote/template.xml",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "tuning_constraints_combination.xml",
     src: "bluenote/tuning_constraints_combination.xml",
@@ -56,6 +59,7 @@ prebuilt_etc {
     src: "compensation/compens_spk_l.conf",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "compens_spk_r.conf",
     src: "compensation/compens_spk_r.conf",
@@ -67,62 +71,181 @@ prebuilt_etc {
     src: "fortemedia/BLUETOOTH.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "BLUETOOTH.mods",
     src: "fortemedia/BLUETOOTH.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSFREE.dat",
     src: "fortemedia/HANDSFREE.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSFREE.mods",
     src: "fortemedia/HANDSFREE.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSET.dat",
     src: "fortemedia/HANDSET.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSET.mods",
     src: "fortemedia/HANDSET.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HEADSET.dat",
     src: "fortemedia/HEADSET.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HEADSET.mods",
     src: "fortemedia/HEADSET.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "mcps.dat",
     src: "fortemedia/mcps.dat",
     defaults: ["aoc_defaults"],
 }
 
+prebuilt_etc {
+    name: "downlink_bluetooth_headset_config.pb",
+    src: "apmg3/downlink_bluetooth_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_dock_config.pb",
+    src: "apmg3/downlink_dock_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_external_speaker_config.pb",
+    src: "apmg3/downlink_external_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_handset_config.pb",
+    src: "apmg3/downlink_handset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_speaker_config.pb",
+    src: "apmg3/downlink_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_wired_headset_config.pb",
+    src: "apmg3/downlink_wired_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_off_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_on_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_off_config.pb",
+    src: "apmg3/uplink_dock_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_on_config.pb",
+    src: "apmg3/uplink_dock_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_off_config.pb",
+    src: "apmg3/uplink_handset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_on_config.pb",
+    src: "apmg3/uplink_handset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_off_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_on_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "waves_config.ini",
     src: "waves/waves_config.ini",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "waves_preset.mps",
     src: "waves/waves_preset.mps",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "test_config.ini",
     src: "waves/tests/test_config.ini",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "test_preset.mps",
     src: "waves/tests/test_preset.mps",

audio/tokay/audio-tables.mk

@@ -62,7 +62,25 @@ PRODUCT_PACKAGES += \
     waves_preset.mps \
     compens_spk_l.conf \
     compens_spk_r.conf \
-    default_mic_compensation.bin
+    default_mic_compensation.bin \
+    downlink_bluetooth_headset_config.pb \
+    downlink_dock_config.pb \
+    downlink_external_speaker_config.pb \
+    downlink_handset_config.pb \
+    downlink_speaker_config.pb \
+    downlink_wired_headset_config.pb \
+    uplink_bluetooth_headset_aec_off_config.pb \
+    uplink_bluetooth_headset_aec_on_config.pb \
+    uplink_dock_aec_off_config.pb \
+    uplink_dock_aec_on_config.pb \
+    uplink_external_speaker_aec_off_config.pb \
+    uplink_external_speaker_aec_on_config.pb \
+    uplink_handset_aec_off_config.pb \
+    uplink_handset_aec_on_config.pb \
+    uplink_speaker_aec_off_config.pb \
+    uplink_speaker_aec_on_config.pb \
+    uplink_wired_headset_aec_off_config.pb \
+    uplink_wired_headset_aec_on_config.pb
 
 # userdebug and eng specific
 PRODUCT_PACKAGES_DEBUG += \
@@ -73,7 +91,8 @@ PRODUCT_PACKAGES_DEBUG += \
     template.xml \
     tuning_constraints_combination.xml \
     test_config.ini \
-    test_preset.mps
+    test_preset.mps \
+    speaker_post_processing_volume_spec.xml
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal

audio/tokay/tuning/Android.bp

@@ -35,16 +35,19 @@ prebuilt_etc {
     src: "bluenote/recording.gatf",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "smartfeature.gstf",
     src: "bluenote/smartfeature.gstf",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "template.xml",
     src: "bluenote/template.xml",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "tuning_constraints_combination.xml",
     src: "bluenote/tuning_constraints_combination.xml",
@@ -56,6 +59,7 @@ prebuilt_etc {
     src: "compensation/compens_spk_l.conf",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "compens_spk_r.conf",
     src: "compensation/compens_spk_r.conf",
@@ -67,62 +71,187 @@ prebuilt_etc {
     src: "fortemedia/BLUETOOTH.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "BLUETOOTH.mods",
     src: "fortemedia/BLUETOOTH.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSFREE.dat",
     src: "fortemedia/HANDSFREE.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSFREE.mods",
     src: "fortemedia/HANDSFREE.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSET.dat",
     src: "fortemedia/HANDSET.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HANDSET.mods",
     src: "fortemedia/HANDSET.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HEADSET.dat",
     src: "fortemedia/HEADSET.dat",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "HEADSET.mods",
     src: "fortemedia/HEADSET.mods",
     defaults: ["aoc_defaults"],
 }
+
 prebuilt_etc {
     name: "mcps.dat",
     src: "fortemedia/mcps.dat",
     defaults: ["aoc_defaults"],
 }
 
+prebuilt_etc {
+    name: "downlink_bluetooth_headset_config.pb",
+    src: "apmg3/downlink_bluetooth_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_dock_config.pb",
+    src: "apmg3/downlink_dock_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_external_speaker_config.pb",
+    src: "apmg3/downlink_external_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_handset_config.pb",
+    src: "apmg3/downlink_handset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_speaker_config.pb",
+    src: "apmg3/downlink_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_wired_headset_config.pb",
+    src: "apmg3/downlink_wired_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_off_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_on_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_off_config.pb",
+    src: "apmg3/uplink_dock_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_on_config.pb",
+    src: "apmg3/uplink_dock_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_off_config.pb",
+    src: "apmg3/uplink_handset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_on_config.pb",
+    src: "apmg3/uplink_handset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_off_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_on_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "waves_config.ini",
     src: "waves/waves_config.ini",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "waves_preset.mps",
     src: "waves/waves_preset.mps",
     soc_specific: true,
 }
+
+prebuilt_etc {
+    name: "speaker_post_processing_volume_spec.xml",
+    src: "pts/speaker_post_processing_volume_spec.xml",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "test_config.ini",
     src: "waves/tests/test_config.ini",
     soc_specific: true,
 }
+
 prebuilt_etc {
     name: "test_preset.mps",
     src: "waves/tests/test_preset.mps",

audio/tokay/tuning/pts/speaker_post_processing_volume_spec.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<xml>
+    <spec>
+        <vol step="1">-56.154594,-57.110912</vol>
+        <vol step="2">-53.155884,-54.127373</vol>
+        <vol step="3">-49.756584,-50.737946</vol>
+        <vol step="4">-46.936535,-47.922485</vol>
+        <vol step="5">-43.24405,-44.23973</vol>
+        <vol step="6">-39.813145,-40.822468</vol>
+        <vol step="7">-36.94418,-37.96505</vol>
+        <vol step="8">-34.103817,-35.12746</vol>
+        <vol step="9">-32.26378,-33.29418</vol>
+        <vol step="10">-30.093319,-31.127796</vol>
+        <vol step="11">-27.625238,-28.658443</vol>
+        <vol step="12">-25.123178,-26.156292</vol>
+        <vol step="13">-23.122547,-24.157629</vol>
+        <vol step="14">-21.27267,-22.309628</vol>
+        <vol step="15">-19.260181,-20.323017</vol>
+        <vol step="16">-17.789768,-18.920961</vol>
+        <vol step="17">-16.70663,-17.944777</vol>
+        <vol step="18">-15.632062,-16.883278</vol>
+        <vol step="19">-14.59099,-15.903705</vol>
+        <vol step="20">-13.215048,-14.563754</vol>
+        <vol step="21">-12.320514,-13.758759</vol>
+        <vol step="22">-11.425067,-12.607503</vol>
+        <vol step="23">-10.545513,-11.783849</vol>
+        <vol step="24">-9.59371,-10.908389</vol>
+        <vol step="25">-8.927933,-10.219385</vol>
+    </spec>
+</xml>