From 5bbb164ef7644dfa7ad4de910d367b2aee0e0db2 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 24 Jun 2025 08:59:13 +0300 Subject: [PATCH] caimito: Remove HIDL audio configuration Change-Id: I45e4f8521c352fe05b247040be9001b2e0e1ae93 --- audio/caiman/audio-tables.mk | 23 - audio/caiman/config/audio_effects.xml | 68 -- .../config/audio_platform_configuration.xml | 317 ------ .../config/audio_policy_configuration.xml | 278 ------ ...cy_configuration_a2dp_offload_disabled.xml | 234 ----- ...icy_configuration_bluetooth_legacy_hal.xml | 230 ----- ...licy_configuration_le_offload_disabled.xml | 255 ----- audio/caiman/config/audio_policy_volumes.xml | 265 ----- ...with_le_audio_policy_configuration_7_0.xml | 71 -- audio/caiman/config/mixer_paths.xml | 925 ------------------ .../config/sound_trigger_configuration.xml | 33 - audio/komodo/audio-tables.mk | 23 - audio/komodo/config/audio_effects.xml | 68 -- .../config/audio_platform_configuration.xml | 317 ------ .../config/audio_policy_configuration.xml | 278 ------ ...cy_configuration_a2dp_offload_disabled.xml | 234 ----- ...icy_configuration_bluetooth_legacy_hal.xml | 230 ----- ...licy_configuration_le_offload_disabled.xml | 255 ----- audio/komodo/config/audio_policy_volumes.xml | 265 ----- ...with_le_audio_policy_configuration_7_0.xml | 71 -- audio/komodo/config/mixer_paths.xml | 925 ------------------ .../config/sound_trigger_configuration.xml | 33 - audio/tokay/audio-tables.mk | 23 - audio/tokay/config/audio_effects.xml | 68 -- .../config/audio_platform_configuration.xml | 317 ------ .../config/audio_policy_configuration.xml | 278 ------ ...cy_configuration_a2dp_offload_disabled.xml | 234 ----- ...icy_configuration_bluetooth_legacy_hal.xml | 230 ----- ...licy_configuration_le_offload_disabled.xml | 255 ----- audio/tokay/config/audio_policy_volumes.xml | 265 ----- ...with_le_audio_policy_configuration_7_0.xml | 71 -- audio/tokay/config/mixer_paths.xml | 924 ----------------- .../config/sound_trigger_configuration.xml | 33 - device-caiman.mk | 9 - device-komodo.mk | 9 - device-tokay.mk | 9 - 36 files changed, 8123 deletions(-) delete mode 100644 audio/caiman/config/audio_effects.xml delete mode 100644 audio/caiman/config/audio_platform_configuration.xml delete mode 100644 audio/caiman/config/audio_policy_configuration.xml delete mode 100644 audio/caiman/config/audio_policy_configuration_a2dp_offload_disabled.xml delete mode 100644 audio/caiman/config/audio_policy_configuration_bluetooth_legacy_hal.xml delete mode 100644 audio/caiman/config/audio_policy_configuration_le_offload_disabled.xml delete mode 100644 audio/caiman/config/audio_policy_volumes.xml delete mode 100644 audio/caiman/config/bluetooth_with_le_audio_policy_configuration_7_0.xml delete mode 100644 audio/caiman/config/mixer_paths.xml delete mode 100644 audio/caiman/config/sound_trigger_configuration.xml delete mode 100644 audio/komodo/config/audio_effects.xml delete mode 100644 audio/komodo/config/audio_platform_configuration.xml delete mode 100644 audio/komodo/config/audio_policy_configuration.xml delete mode 100644 audio/komodo/config/audio_policy_configuration_a2dp_offload_disabled.xml delete mode 100644 audio/komodo/config/audio_policy_configuration_bluetooth_legacy_hal.xml delete mode 100644 audio/komodo/config/audio_policy_configuration_le_offload_disabled.xml delete mode 100644 audio/komodo/config/audio_policy_volumes.xml delete mode 100644 audio/komodo/config/bluetooth_with_le_audio_policy_configuration_7_0.xml delete mode 100644 audio/komodo/config/mixer_paths.xml delete mode 100644 audio/komodo/config/sound_trigger_configuration.xml delete mode 100644 audio/tokay/config/audio_effects.xml delete mode 100644 audio/tokay/config/audio_platform_configuration.xml delete mode 100644 audio/tokay/config/audio_policy_configuration.xml delete mode 100644 audio/tokay/config/audio_policy_configuration_a2dp_offload_disabled.xml delete mode 100644 audio/tokay/config/audio_policy_configuration_bluetooth_legacy_hal.xml delete mode 100644 audio/tokay/config/audio_policy_configuration_le_offload_disabled.xml delete mode 100644 audio/tokay/config/audio_policy_volumes.xml delete mode 100644 audio/tokay/config/bluetooth_with_le_audio_policy_configuration_7_0.xml delete mode 100644 audio/tokay/config/mixer_paths.xml delete mode 100644 audio/tokay/config/sound_trigger_configuration.xml diff --git a/audio/caiman/audio-tables.mk b/audio/caiman/audio-tables.mk index 5d4bbc59..8ede2aeb 100644 --- a/audio/caiman/audio-tables.mk +++ b/audio/caiman/audio-tables.mk @@ -16,32 +16,9 @@ AUDIO_TABLE_FOLDER := caiman -# Choose AIDL config by build flag. -ifeq ($(USE_AUDIO_HAL_AIDL),true) PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_PACKAGES += audio_aidl_configs -else -# Platform Configuration for AudioHAL / SoundTriggerHAL -PRODUCT_COPY_FILES += \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml - -# AudioEffectHAL Configuration -PRODUCT_COPY_FILES += \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml - -# Mixer Path Configuration for AudioHAL -PRODUCT_COPY_FILES += \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml -endif - # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw SPK_FIRMWARE_FULL_PATH := device/google/caimito/audio/$(SPK_FIRMWARE_PATH) diff --git a/audio/caiman/config/audio_effects.xml b/audio/caiman/config/audio_effects.xml deleted file mode 100644 index 11e66e53..00000000 --- a/audio/caiman/config/audio_effects.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/caiman/config/audio_platform_configuration.xml b/audio/caiman/config/audio_platform_configuration.xml deleted file mode 100644 index c476ae75..00000000 --- a/audio/caiman/config/audio_platform_configuration.xml +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/caiman/config/audio_policy_configuration.xml b/audio/caiman/config/audio_policy_configuration.xml deleted file mode 100644 index ff656e5f..00000000 --- a/audio/caiman/config/audio_policy_configuration.xml +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/caiman/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/caiman/config/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100644 index 552618c2..00000000 --- a/audio/caiman/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/caiman/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/caiman/config/audio_policy_configuration_bluetooth_legacy_hal.xml deleted file mode 100644 index 54a4bc58..00000000 --- a/audio/caiman/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/caiman/config/audio_policy_configuration_le_offload_disabled.xml b/audio/caiman/config/audio_policy_configuration_le_offload_disabled.xml deleted file mode 100644 index 91fa6801..00000000 --- a/audio/caiman/config/audio_policy_configuration_le_offload_disabled.xml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/caiman/config/audio_policy_volumes.xml b/audio/caiman/config/audio_policy_volumes.xml deleted file mode 100644 index 4f24a35b..00000000 --- a/audio/caiman/config/audio_policy_volumes.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - 0,-4200 - 33,-2800 - 66,-1400 - 100,0 - - - 0,-2400 - 33,-1600 - 66,-800 - 100,0 - - - 0,-2400 - 33,-1600 - 66,-800 - 100,0 - - - - - 1,-3000 - 33,-2600 - 66,-2200 - 100,-1800 - - - 1,-4500 - 29,-3400 - 57,-2250 - 71,-1900 - 86,-1530 - 100,-1100 - - - - - - - 1,-4000 - 29,-2950 - 43,-2350 - 57,-1850 - 71,-1400 - 86,-700 - 100,0 - - - - - - - 1,-9000 - 4,-6370 - 8,-6105 - 12,-5810 - 16,-5520 - 20,-5220 - 24,-4870 - 28,-4490 - 32,-4278 - 36,-4027 - 40,-3770 - 44,-3560 - 48,-3300 - 52,-3080 - 56,-2800 - 60,-2620 - 64,-2350 - 68,-2200 - 72,-2100 - 76,-1930 - 80,-1700 - 84,-1460 - 88,-1190 - 92,-850 - 96,-510 - 100,0 - - - - - - - 0,-5600 - 29,-3520 - 57,-1500 - 71,-1150 - 86,-500 - 100,0 - - - - - - - 1,-4500 - 29,-3800 - 71,-1850 - 86,-1000 - 100,-500 - - - - - - 0,-4200 - 33,-2800 - 66,-1400 - 100,0 - - - 0,-2400 - 33,-1600 - 66,-800 - 100,0 - - - 0,-4200 - 33,-2800 - 66,-1400 - 100,0 - - - - - 1,-3000 - 33,-2600 - 66,-2200 - 100,-1800 - - - 1,-4500 - 29,-3400 - 57,-2250 - 71,-1900 - 86,-1530 - 100,-1100 - - - - - - 1,-3000 - 33,-2600 - 66,-2200 - 100,-1800 - - - 1,-5700 - 29,-4230 - 43,-3300 - 57,-3100 - 71,-2500 - 100,-1400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/caiman/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/caiman/config/bluetooth_with_le_audio_policy_configuration_7_0.xml deleted file mode 100644 index 8b2af59c..00000000 --- a/audio/caiman/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/audio/caiman/config/mixer_paths.xml b/audio/caiman/config/mixer_paths.xml deleted file mode 100644 index 54b3bd79..00000000 --- a/audio/caiman/config/mixer_paths.xml +++ /dev/null @@ -1,925 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/caiman/config/sound_trigger_configuration.xml b/audio/caiman/config/sound_trigger_configuration.xml deleted file mode 100644 index dbee090c..00000000 --- a/audio/caiman/config/sound_trigger_configuration.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/audio-tables.mk b/audio/komodo/audio-tables.mk index 41c410a8..98047902 100644 --- a/audio/komodo/audio-tables.mk +++ b/audio/komodo/audio-tables.mk @@ -16,32 +16,9 @@ AUDIO_TABLE_FOLDER := komodo -# Choose AIDL config by build flag. -ifeq ($(USE_AUDIO_HAL_AIDL),true) PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_PACKAGES += audio_aidl_configs -else -# Platform Configuration for AudioHAL / SoundTriggerHAL -PRODUCT_COPY_FILES += \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml - -# AudioEffectHAL Configuration -PRODUCT_COPY_FILES += \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml - -# Mixer Path Configuration for AudioHAL -PRODUCT_COPY_FILES += \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml -endif - # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw SPK_FIRMWARE_FULL_PATH := device/google/caimito/audio/$(SPK_FIRMWARE_PATH) diff --git a/audio/komodo/config/audio_effects.xml b/audio/komodo/config/audio_effects.xml deleted file mode 100644 index 11e66e53..00000000 --- a/audio/komodo/config/audio_effects.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/config/audio_platform_configuration.xml b/audio/komodo/config/audio_platform_configuration.xml deleted file mode 100644 index c476ae75..00000000 --- a/audio/komodo/config/audio_platform_configuration.xml +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/config/audio_policy_configuration.xml b/audio/komodo/config/audio_policy_configuration.xml deleted file mode 100644 index ff656e5f..00000000 --- a/audio/komodo/config/audio_policy_configuration.xml +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/komodo/config/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100644 index 552618c2..00000000 --- a/audio/komodo/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/komodo/config/audio_policy_configuration_bluetooth_legacy_hal.xml deleted file mode 100644 index 54a4bc58..00000000 --- a/audio/komodo/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/config/audio_policy_configuration_le_offload_disabled.xml b/audio/komodo/config/audio_policy_configuration_le_offload_disabled.xml deleted file mode 100644 index 91fa6801..00000000 --- a/audio/komodo/config/audio_policy_configuration_le_offload_disabled.xml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/config/audio_policy_volumes.xml b/audio/komodo/config/audio_policy_volumes.xml deleted file mode 100644 index 6bdb0d11..00000000 --- a/audio/komodo/config/audio_policy_volumes.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - 0,-4200 - 33,-2800 - 66,-1400 - 100,0 - - - 0,-2400 - 33,-1600 - 66,-800 - 100,0 - - - 0,-2400 - 33,-1600 - 66,-800 - 100,0 - - - - - 1,-3000 - 33,-2600 - 66,-2200 - 100,-1800 - - - 1,-5200 - 13,-5000 - 28,-4400 - 56,-3380 - 71,-3120 - 85,-2750 - 100,-2150 - - - - - - - 1,-4935 - 14,-3320 - 28,-2960 - 71,-1400 - 100,0 - - - - - - - 1,-6100 - 4,-5910 - 8,-5634 - 12,-5300 - 16,-4995 - 20,-4670 - 24,-4300 - 28,-3944 - 32,-3705 - 36,-3472 - 40,-3200 - 44,-3020 - 48,-2800 - 52,-2575 - 56,-2300 - 60,-2130 - 64,-1925 - 68,-1710 - 72,-1600 - 76,-1500 - 80,-1375 - 84,-1277 - 88,-991 - 92,-741 - 96,-475 - 100,0 - - - - - - - 0,-5600 - 14,-4670 - 28,-3060 - 71,-1050 - 100,-100 - - - - - - - 1,-6350 - 14,-4300 - 28,-3710 - 66,-2100 - 85,-1550 - 100,-780 - - - - - - 0,-4200 - 33,-2800 - 66,-1400 - 100,0 - - - 0,-2400 - 33,-1600 - 66,-800 - 100,0 - - - 0,-4200 - 33,-2800 - 66,-1400 - 100,0 - - - - - 1,-3000 - 33,-2600 - 66,-2200 - 100,-1800 - - - 1,-5200 - 13,-5000 - 28,-4400 - 56,-3380 - 71,-3120 - 85,-2750 - 100,-2150 - - - - - - 1,-3000 - 33,-2600 - 66,-2200 - 100,-1800 - - - 1,-6600 - 13,-6220 - 28,-5500 - 42,-4600 - 57,-4250 - 100,-2780 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/komodo/config/bluetooth_with_le_audio_policy_configuration_7_0.xml deleted file mode 100644 index 8b2af59c..00000000 --- a/audio/komodo/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/audio/komodo/config/mixer_paths.xml b/audio/komodo/config/mixer_paths.xml deleted file mode 100644 index 54b3bd79..00000000 --- a/audio/komodo/config/mixer_paths.xml +++ /dev/null @@ -1,925 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/komodo/config/sound_trigger_configuration.xml b/audio/komodo/config/sound_trigger_configuration.xml deleted file mode 100644 index dbee090c..00000000 --- a/audio/komodo/config/sound_trigger_configuration.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/audio-tables.mk b/audio/tokay/audio-tables.mk index 86f565fa..e0586afb 100644 --- a/audio/tokay/audio-tables.mk +++ b/audio/tokay/audio-tables.mk @@ -16,32 +16,9 @@ AUDIO_TABLE_FOLDER := tokay -# Choose AIDL config by build flag. -ifeq ($(USE_AUDIO_HAL_AIDL),true) PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_PACKAGES += audio_aidl_configs -else -# Platform Configuration for AudioHAL / SoundTriggerHAL -PRODUCT_COPY_FILES += \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml - -# AudioEffectHAL Configuration -PRODUCT_COPY_FILES += \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml - -# Mixer Path Configuration for AudioHAL -PRODUCT_COPY_FILES += \ - device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml -endif - # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw SPK_FIRMWARE_FULL_PATH := device/google/caimito/audio/$(SPK_FIRMWARE_PATH) diff --git a/audio/tokay/config/audio_effects.xml b/audio/tokay/config/audio_effects.xml deleted file mode 100644 index 11e66e53..00000000 --- a/audio/tokay/config/audio_effects.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/config/audio_platform_configuration.xml b/audio/tokay/config/audio_platform_configuration.xml deleted file mode 100644 index c476ae75..00000000 --- a/audio/tokay/config/audio_platform_configuration.xml +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/config/audio_policy_configuration.xml b/audio/tokay/config/audio_policy_configuration.xml deleted file mode 100644 index ff656e5f..00000000 --- a/audio/tokay/config/audio_policy_configuration.xml +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tokay/config/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100644 index 552618c2..00000000 --- a/audio/tokay/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tokay/config/audio_policy_configuration_bluetooth_legacy_hal.xml deleted file mode 100644 index 54a4bc58..00000000 --- a/audio/tokay/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/config/audio_policy_configuration_le_offload_disabled.xml b/audio/tokay/config/audio_policy_configuration_le_offload_disabled.xml deleted file mode 100644 index 91fa6801..00000000 --- a/audio/tokay/config/audio_policy_configuration_le_offload_disabled.xml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/config/audio_policy_volumes.xml b/audio/tokay/config/audio_policy_volumes.xml deleted file mode 100644 index 4f24a35b..00000000 --- a/audio/tokay/config/audio_policy_volumes.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - 0,-4200 - 33,-2800 - 66,-1400 - 100,0 - - - 0,-2400 - 33,-1600 - 66,-800 - 100,0 - - - 0,-2400 - 33,-1600 - 66,-800 - 100,0 - - - - - 1,-3000 - 33,-2600 - 66,-2200 - 100,-1800 - - - 1,-4500 - 29,-3400 - 57,-2250 - 71,-1900 - 86,-1530 - 100,-1100 - - - - - - - 1,-4000 - 29,-2950 - 43,-2350 - 57,-1850 - 71,-1400 - 86,-700 - 100,0 - - - - - - - 1,-9000 - 4,-6370 - 8,-6105 - 12,-5810 - 16,-5520 - 20,-5220 - 24,-4870 - 28,-4490 - 32,-4278 - 36,-4027 - 40,-3770 - 44,-3560 - 48,-3300 - 52,-3080 - 56,-2800 - 60,-2620 - 64,-2350 - 68,-2200 - 72,-2100 - 76,-1930 - 80,-1700 - 84,-1460 - 88,-1190 - 92,-850 - 96,-510 - 100,0 - - - - - - - 0,-5600 - 29,-3520 - 57,-1500 - 71,-1150 - 86,-500 - 100,0 - - - - - - - 1,-4500 - 29,-3800 - 71,-1850 - 86,-1000 - 100,-500 - - - - - - 0,-4200 - 33,-2800 - 66,-1400 - 100,0 - - - 0,-2400 - 33,-1600 - 66,-800 - 100,0 - - - 0,-4200 - 33,-2800 - 66,-1400 - 100,0 - - - - - 1,-3000 - 33,-2600 - 66,-2200 - 100,-1800 - - - 1,-4500 - 29,-3400 - 57,-2250 - 71,-1900 - 86,-1530 - 100,-1100 - - - - - - 1,-3000 - 33,-2600 - 66,-2200 - 100,-1800 - - - 1,-5700 - 29,-4230 - 43,-3300 - 57,-3100 - 71,-2500 - 100,-1400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/tokay/config/bluetooth_with_le_audio_policy_configuration_7_0.xml deleted file mode 100644 index 8b2af59c..00000000 --- a/audio/tokay/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/audio/tokay/config/mixer_paths.xml b/audio/tokay/config/mixer_paths.xml deleted file mode 100644 index 9465f602..00000000 --- a/audio/tokay/config/mixer_paths.xml +++ /dev/null @@ -1,924 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tokay/config/sound_trigger_configuration.xml b/audio/tokay/config/sound_trigger_configuration.xml deleted file mode 100644 index dbee090c..00000000 --- a/audio/tokay/config/sound_trigger_configuration.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/device-caiman.mk b/device-caiman.mk index dd2bd1b6..0d95473c 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -52,9 +52,7 @@ include device/google/caimito/caiman/uwb/uwb_calibration.mk # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) USE_AUDIO_HAL_AIDL := true -endif include device/google/caimito/audio/caiman/audio-tables.mk include device/google/zumapro/device-shipping-common.mk @@ -177,13 +175,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true -ifneq ($(USE_AUDIO_HAL_AIDL),true) -# HIDL Sound Dose -PRODUCT_PACKAGES += \ - android.hardware.audio.sounddose-vendor-impl \ - audio_sounddose_aoc -endif - # HdMic Audio PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.app.audio.gsenet.version=1 diff --git a/device-komodo.mk b/device-komodo.mk index 0c425546..2438853f 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -52,9 +52,7 @@ include device/google/caimito/komodo/uwb/uwb_calibration.mk # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) USE_AUDIO_HAL_AIDL := true -endif include device/google/caimito/audio/komodo/audio-tables.mk include device/google/zumapro/device-shipping-common.mk @@ -194,13 +192,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true -ifneq ($(USE_AUDIO_HAL_AIDL),true) -# HIDL Sound Dose -PRODUCT_PACKAGES += \ - android.hardware.audio.sounddose-vendor-impl \ - audio_sounddose_aoc -endif - # HdMic Audio PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.app.audio.gsenet.version=1 diff --git a/device-tokay.mk b/device-tokay.mk index 3c15ec6b..e9545c65 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -48,9 +48,7 @@ endif # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) USE_AUDIO_HAL_AIDL := true -endif include device/google/caimito/audio/tokay/audio-tables.mk include device/google/zumapro/device-shipping-common.mk @@ -176,13 +174,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true -ifneq ($(USE_AUDIO_HAL_AIDL),true) -# HIDL Sound Dose -PRODUCT_PACKAGES += \ - android.hardware.audio.sounddose-vendor-impl \ - audio_sounddose_aoc -endif - # HdMic Audio PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.app.audio.gsenet.version=1