diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index 8652967..f1c1a8d 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -16,32 +16,9 @@ AUDIO_TABLE_FOLDER := husky -# Choose AIDL config by build flag. -ifeq ($(USE_AUDIO_HAL_AIDL),true) PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_PACKAGES += audio_aidl_configs -else -# Platform Configuration for AudioHAL / SoundTriggerHAL -PRODUCT_COPY_FILES += \ - device/google/shusky/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/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/shusky/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/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/shusky/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/shusky/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/shusky/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/shusky/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/shusky/audio/$(SPK_FIRMWARE_PATH) @@ -60,12 +37,9 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps -ifeq ($(USE_AUDIO_HAL_AIDL),true) # Offload spatializer config PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \ - -endif + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural diff --git a/audio/husky/config/audio_effects.xml b/audio/husky/config/audio_effects.xml deleted file mode 100644 index 11e66e5..0000000 --- a/audio/husky/config/audio_effects.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml deleted file mode 100644 index 6423daf..0000000 --- a/audio/husky/config/audio_platform_configuration.xml +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/husky/config/audio_policy_configuration.xml b/audio/husky/config/audio_policy_configuration.xml deleted file mode 100644 index adb66a3..0000000 --- a/audio/husky/config/audio_policy_configuration.xml +++ /dev/null @@ -1,282 +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/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100644 index e3f0ce1..0000000 --- a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,238 +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/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml deleted file mode 100644 index eccadf7..0000000 --- a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ /dev/null @@ -1,231 +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/husky/config/audio_policy_configuration_le_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml deleted file mode 100644 index d4f70a9..0000000 --- a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml +++ /dev/null @@ -1,259 +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/husky/config/audio_policy_volumes.xml b/audio/husky/config/audio_policy_volumes.xml deleted file mode 100644 index 8a138a0..0000000 --- a/audio/husky/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,-6920 - 4,-6920 - 8,-6664 - 12,-6374 - 16,-6082 - 20,-5759 - 24,-5410 - 28,-5038 - 32,-4807 - 36,-4577 - 40,-4339 - 44,-4132 - 48,-3860 - 52,-3569 - 56,-3223 - 60,-2823 - 64,-2452 - 68,-2078 - 72,-1795 - 76,-1561 - 80,-1226 - 84,-956 - 88,-789 - 92,-635 - 96,-505 - 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/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml deleted file mode 100644 index efd7277..0000000 --- a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/audio/husky/config/mixer_paths.xml b/audio/husky/config/mixer_paths.xml deleted file mode 100644 index 924c62c..0000000 --- a/audio/husky/config/mixer_paths.xml +++ /dev/null @@ -1,926 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/husky/config/sound_trigger_configuration.xml b/audio/husky/config/sound_trigger_configuration.xml deleted file mode 100644 index dbee090..0000000 --- a/audio/husky/config/sound_trigger_configuration.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index ec2c53c..60eb1a0 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -16,32 +16,9 @@ AUDIO_TABLE_FOLDER := shiba -# Choose AIDL config by build flag. -ifeq ($(USE_AUDIO_HAL_AIDL),true) PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config PRODUCT_PACKAGES += audio_aidl_configs -else -# Platform Configuration for AudioHAL / SoundTriggerHAL -PRODUCT_COPY_FILES += \ - device/google/shusky/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/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/shusky/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/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/shusky/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/shusky/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/shusky/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/shusky/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/shusky/audio/$(SPK_FIRMWARE_PATH) @@ -60,12 +37,9 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps -ifeq ($(USE_AUDIO_HAL_AIDL),true) # Offload spatializer config PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \ - -endif + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural diff --git a/audio/shiba/config/audio_effects.xml b/audio/shiba/config/audio_effects.xml deleted file mode 100644 index 11e66e5..0000000 --- a/audio/shiba/config/audio_effects.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml deleted file mode 100644 index 6423daf..0000000 --- a/audio/shiba/config/audio_platform_configuration.xml +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/shiba/config/audio_policy_configuration.xml b/audio/shiba/config/audio_policy_configuration.xml deleted file mode 100644 index 4c2445d..0000000 --- a/audio/shiba/config/audio_policy_configuration.xml +++ /dev/null @@ -1,282 +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/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100644 index e3f0ce1..0000000 --- a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,238 +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/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml deleted file mode 100644 index eccadf7..0000000 --- a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ /dev/null @@ -1,231 +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/shiba/config/audio_policy_configuration_le_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml deleted file mode 100644 index 912e7a8..0000000 --- a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml +++ /dev/null @@ -1,259 +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/shiba/config/audio_policy_volumes.xml b/audio/shiba/config/audio_policy_volumes.xml deleted file mode 100644 index b087a21..0000000 --- a/audio/shiba/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,-5927 - 4,-5927 - 8,-5574 - 12,-5281 - 16,-4952 - 20,-4562 - 24,-4213 - 28,-3838 - 32,-3600 - 36,-3385 - 40,-3116 - 44,-2927 - 48,-2665 - 52,-2436 - 56,-2181 - 60,-1985 - 64,-1743 - 68,-1553 - 72,-1427 - 76,-1166 - 80,-1045 - 84,-895 - 88,-644 - 92,-486 - 96,-209 - 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/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml deleted file mode 100644 index efd7277..0000000 --- a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/audio/shiba/config/mixer_paths.xml b/audio/shiba/config/mixer_paths.xml deleted file mode 100644 index 924c62c..0000000 --- a/audio/shiba/config/mixer_paths.xml +++ /dev/null @@ -1,926 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/shiba/config/sound_trigger_configuration.xml b/audio/shiba/config/sound_trigger_configuration.xml deleted file mode 100644 index dbee090..0000000 --- a/audio/shiba/config/sound_trigger_configuration.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/device-husky.mk b/device-husky.mk index 65bc45f..a2a0f32 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -49,9 +49,7 @@ PRODUCT_COPY_FILES += \ CAMERA_PRODUCT ?= husky -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true) USE_AUDIO_HAL_AIDL := true -endif include device/google/shusky/camera/camera.mk include device/google/shusky/audio/husky/audio-tables.mk @@ -125,23 +123,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.finder.supported=true -ifeq ($(USE_AUDIO_HAL_AIDL),true) -# AIDL - -else -# HIDL - -# Spatial Audio -PRODUCT_PACKAGES += \ - libspatialaudio - -# Sound Dose -PRODUCT_PACKAGES += \ - android.hardware.audio.sounddose-vendor-impl \ - audio_sounddose_aoc - -endif - # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true diff --git a/device-shiba.mk b/device-shiba.mk index c5d5870..0059ef0 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -39,9 +39,7 @@ endif DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay CAMERA_PRODUCT ?= shiba -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true) USE_AUDIO_HAL_AIDL := true -endif include device/google/shusky/camera/camera.mk include device/google/shusky/audio/shiba/audio-tables.mk @@ -119,23 +117,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.finder.supported=true -ifeq ($(USE_AUDIO_HAL_AIDL),true) -# AIDL - -else -# HIDL - -# Spatial Audio -PRODUCT_PACKAGES += \ - libspatialaudio - -# Sound Dose -PRODUCT_PACKAGES += \ - android.hardware.audio.sounddose-vendor-impl \ - audio_sounddose_aoc - -endif - # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true