diff --git a/audio/comet/audio-tables.mk b/audio/comet/audio-tables.mk index 49123f8..3b4bd07 100644 --- a/audio/comet/audio-tables.mk +++ b/audio/comet/audio-tables.mk @@ -65,7 +65,26 @@ PRODUCT_PACKAGES += \ compens_spk_l_1.conf \ compens_spk_l_2.conf \ compens_spk_r_1.conf \ - compens_spk_r_2.conf + compens_spk_r_2.conf \ + 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 specific PRODUCT_PACKAGES_DEBUG += \ diff --git a/audio/comet/tuning/Android.bp b/audio/comet/tuning/Android.bp index 9408763..1ba2220 100644 --- a/audio/comet/tuning/Android.bp +++ b/audio/comet/tuning/Android.bp @@ -12,6 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. + soong_namespace {} package { @@ -131,6 +132,114 @@ prebuilt_etc { 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", diff --git a/audio/comet/tuning/apmg3/downlink_bluetooth_headset_config.pb b/audio/comet/tuning/apmg3/downlink_bluetooth_headset_config.pb new file mode 100644 index 0000000..4d26cce Binary files /dev/null and b/audio/comet/tuning/apmg3/downlink_bluetooth_headset_config.pb differ diff --git a/audio/comet/tuning/apmg3/downlink_dock_config.pb b/audio/comet/tuning/apmg3/downlink_dock_config.pb new file mode 100644 index 0000000..2fdd177 Binary files /dev/null and b/audio/comet/tuning/apmg3/downlink_dock_config.pb differ diff --git a/audio/comet/tuning/apmg3/downlink_external_speaker_config.pb b/audio/comet/tuning/apmg3/downlink_external_speaker_config.pb new file mode 100644 index 0000000..f501ab8 Binary files /dev/null and b/audio/comet/tuning/apmg3/downlink_external_speaker_config.pb differ diff --git a/audio/comet/tuning/apmg3/downlink_handset_config.pb b/audio/comet/tuning/apmg3/downlink_handset_config.pb new file mode 100644 index 0000000..a5c2545 Binary files /dev/null and b/audio/comet/tuning/apmg3/downlink_handset_config.pb differ diff --git a/audio/comet/tuning/apmg3/downlink_speaker_config.pb b/audio/comet/tuning/apmg3/downlink_speaker_config.pb new file mode 100644 index 0000000..53b94d0 Binary files /dev/null and b/audio/comet/tuning/apmg3/downlink_speaker_config.pb differ diff --git a/audio/comet/tuning/apmg3/downlink_wired_headset_config.pb b/audio/comet/tuning/apmg3/downlink_wired_headset_config.pb new file mode 100644 index 0000000..0f98f65 Binary files /dev/null and b/audio/comet/tuning/apmg3/downlink_wired_headset_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb new file mode 100644 index 0000000..40dd10b Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_off_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb new file mode 100644 index 0000000..2cf3692 Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_bluetooth_headset_aec_on_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb new file mode 100644 index 0000000..7a9e57d Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_dock_aec_off_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb new file mode 100644 index 0000000..a6bb5a4 Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_dock_aec_on_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_external_speaker_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_off_config.pb new file mode 100644 index 0000000..38141ba Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_off_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_external_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_on_config.pb new file mode 100644 index 0000000..6ee72a1 Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_external_speaker_aec_on_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb new file mode 100644 index 0000000..3cdf914 Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb new file mode 100644 index 0000000..f02b8a2 Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_off_config.pb new file mode 100644 index 0000000..0ee7764 Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_speaker_aec_off_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb new file mode 100644 index 0000000..182628f Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_wired_headset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_off_config.pb new file mode 100644 index 0000000..3578e0e Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_off_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_wired_headset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_on_config.pb new file mode 100644 index 0000000..791ff9e Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_wired_headset_aec_on_config.pb differ