diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 8c60295..913c0be 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -42,9 +42,6 @@ BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl" # Audio AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true -BOARD_SUPPORTS_OPENSOURCE_STHAL := true -BOARD_SUPPORTS_SOUND_TRIGGER := true - # Bootloader TARGET_BOOTLOADER_BOARD_NAME := sm6150 TARGET_NO_BOOTLOADER := true diff --git a/configs/audio/sound_trigger_platform_info.xml b/configs/audio/sound_trigger_platform_info.xml deleted file mode 100644 index a85a180..0000000 --- a/configs/audio/sound_trigger_platform_info.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/hidl/manifest.xml b/configs/hidl/manifest.xml index d585703..5a3fbc3 100644 --- a/configs/hidl/manifest.xml +++ b/configs/hidl/manifest.xml @@ -80,15 +80,6 @@ default - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - android.hardware.tetheroffload.config hwbinder diff --git a/sm6150.mk b/sm6150.mk index fbe42b0..78063c8 100644 --- a/sm6150.mk +++ b/sm6150.mk @@ -45,14 +45,12 @@ PRODUCT_PACKAGES += \ android.hardware.audio@7.0-impl \ android.hardware.audio.effect@7.0-impl \ android.hardware.audio.service \ - android.hardware.bluetooth.audio-impl \ - android.hardware.soundtrigger@2.3-impl + android.hardware.bluetooth.audio-impl PRODUCT_PACKAGES += \ audio.bluetooth.default \ audio.usb.default \ - audio.r_submix.default \ - sound_trigger.primary.sm6150 + audio.r_submix.default PRODUCT_PACKAGES += \ libqcompostprocbundle \ @@ -76,9 +74,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(LOCAL_PATH)/configs/audio/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml - PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \