Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3729b121 authored by Manisha Agarwal's avatar Manisha Agarwal Committed by Gerrit - the friendly Code Review server
Browse files

audio: Add qssi removed entries for individual targets. 

Add entries of audio-kernel libs and properties removed from
qssi to lito, kona and atoll targets makefile.

Change-Id: Ife3a9b29695c13ff1ee4479059f2d39f0a93ac66
parent 180e00bc

configs/atoll/atoll.mk

+94 −0
Original line number Diff line number Diff line
@@ -69,6 +69,87 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true 
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

##AUDIO_FEATURE_FLAGS



AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.r_submix.default

AUDIO_HARDWARE += audio.primary.atoll



#HAL Wrapper

AUDIO_WRAPPER := libqahw

AUDIO_WRAPPER += libqahwwrapper



#HAL Test app

AUDIO_HAL_TEST_APPS := hal_play_test

AUDIO_HAL_TEST_APPS += hal_rec_test



PRODUCT_PACKAGES += $(AUDIO_HARDWARE)

PRODUCT_PACKAGES += $(AUDIO_WRAPPER)

PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)



ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)

BOARD_VENDOR_KERNEL_MODULES := \

    $(KERNEL_MODULES_OUT)/audio_apr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \

    $(KERNEL_MODULES_OUT)/audio_adsp_loader.ko \

    $(KERNEL_MODULES_OUT)/audio_q6.ko \

    $(KERNEL_MODULES_OUT)/audio_usf.ko \

    $(KERNEL_MODULES_OUT)/audio_pinctrl_lpi.ko \

    $(KERNEL_MODULES_OUT)/audio_swr.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd_core.ko \

    $(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa881x.ko \

    $(KERNEL_MODULES_OUT)/audio_platform.ko \

    $(KERNEL_MODULES_OUT)/audio_hdmi.ko \

    $(KERNEL_MODULES_OUT)/audio_stub.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \

    $(KERNEL_MODULES_OUT)/audio_mbhc.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x_slave.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd937x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd937x_slave.ko \

    $(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_va_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_rx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_tx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_native.ko \

    $(KERNEL_MODULES_OUT)/audio_machine_atoll.ko \

    $(KERNEL_MODULES_OUT)/audio_snd_event.ko

endif



#Audio DLKM

AUDIO_DLKM := audio_apr.ko

AUDIO_DLKM += audio_q6_pdr.ko

AUDIO_DLKM += audio_q6_notifier.ko

AUDIO_DLKM += audio_adsp_loader.ko

AUDIO_DLKM += audio_q6.ko

AUDIO_DLKM += audio_usf.ko

AUDIO_DLKM += audio_pinctrl_wcd.ko

AUDIO_DLKM += audio_swr.ko

AUDIO_DLKM += audio_wcd_core.ko

AUDIO_DLKM += audio_swr_ctrl.ko

AUDIO_DLKM += audio_wsa881x.ko

AUDIO_DLKM += audio_platform.ko

AUDIO_DLKM += audio_hdmi.ko

AUDIO_DLKM += audio_stub.ko

AUDIO_DLKM += audio_wcd9xxx.ko

AUDIO_DLKM += audio_mbhc.ko

AUDIO_DLKM += audio_native.ko

AUDIO_DLKM += audio_wcd938x.ko

AUDIO_DLKM += audio_wcd938x_slave.ko

AUDIO_DLKM += audio_wcd937x.ko

AUDIO_DLKM += audio_wcd937x_slave.ko

AUDIO_DLKM += audio_bolero_cdc.ko

AUDIO_DLKM += audio_wsa_macro.ko

AUDIO_DLKM += audio_va_macro.ko

AUDIO_DLKM += audio_rx_macro.ko

AUDIO_DLKM += audio_tx_macro.ko

AUDIO_DLKM += audio_machine_atoll.ko

AUDIO_DLKM += audio_snd_event.ko



PRODUCT_PACKAGES += $(AUDIO_DLKM)



#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
@@ -115,6 +196,19 @@ persist.vendor.audio.fluence.voicecall=true\ 
persist.vendor.audio.fluence.voicerec=false\

persist.vendor.audio.fluence.speaker=true



#

#snapdragon value add features

#

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.ssr=false



##fluencetype can be "fluence" or "fluencepro" or "none"

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.fluencetype=none\

persist.audio.fluence.voicecall=true\

persist.audio.fluence.voicerec=false\

persist.audio.fluence.speaker=true



##speaker protection v3 switch and ADSP AFE API version

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.spv3.enable=true\

configs/kona/kona.mk

+94 −0
Original line number Diff line number Diff line
@@ -81,6 +81,87 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true 
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

##AUDIO_FEATURE_FLAGS



AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.r_submix.default

AUDIO_HARDWARE += audio.primary.kona



#HAL Wrapper

AUDIO_WRAPPER := libqahw

AUDIO_WRAPPER += libqahwwrapper



#HAL Test app

AUDIO_HAL_TEST_APPS := hal_play_test

AUDIO_HAL_TEST_APPS += hal_rec_test



PRODUCT_PACKAGES += $(AUDIO_HARDWARE)

PRODUCT_PACKAGES += $(AUDIO_WRAPPER)

PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)



ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)

BOARD_VENDOR_KERNEL_MODULES := \

    $(KERNEL_MODULES_OUT)/audio_apr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \

    $(KERNEL_MODULES_OUT)/audio_adsp_loader.ko \

    $(KERNEL_MODULES_OUT)/audio_q6.ko \

    $(KERNEL_MODULES_OUT)/audio_usf.ko \

    $(KERNEL_MODULES_OUT)/audio_pinctrl_wcd.ko \

    $(KERNEL_MODULES_OUT)/audio_pinctrl_lpi.ko \

    $(KERNEL_MODULES_OUT)/audio_swr.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd_core.ko \

    $(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa881x.ko \

    $(KERNEL_MODULES_OUT)/audio_platform.ko \

    $(KERNEL_MODULES_OUT)/audio_hdmi.ko \

    $(KERNEL_MODULES_OUT)/audio_stub.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \

    $(KERNEL_MODULES_OUT)/audio_mbhc.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x_slave.ko \

    $(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_va_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_rx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_tx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_native.ko \

    $(KERNEL_MODULES_OUT)/audio_machine_kona.ko \

    $(KERNEL_MODULES_OUT)/audio_snd_event.ko

endif



BOARD_VENDOR_KERNEL_MODULES += \

    $(KERNEL_MODULES_OUT)/qca_cld3_wlan.ko



#Audio DLKM

AUDIO_DLKM := audio_apr.ko

AUDIO_DLKM += audio_q6_pdr.ko

AUDIO_DLKM += audio_q6_notifier.ko

AUDIO_DLKM += audio_adsp_loader.ko

AUDIO_DLKM += audio_q6.ko

AUDIO_DLKM += audio_usf.ko

AUDIO_DLKM += audio_pinctrl_wcd.ko

AUDIO_DLKM += audio_swr.ko

AUDIO_DLKM += audio_wcd_core.ko

AUDIO_DLKM += audio_swr_ctrl.ko

AUDIO_DLKM += audio_wsa881x.ko

AUDIO_DLKM += audio_platform.ko

AUDIO_DLKM += audio_hdmi.ko

AUDIO_DLKM += audio_stub.ko

AUDIO_DLKM += audio_wcd9xxx.ko

AUDIO_DLKM += audio_mbhc.ko

AUDIO_DLKM += audio_native.ko

AUDIO_DLKM += audio_wcd938x.ko

AUDIO_DLKM += audio_wcd938x_slave.ko

AUDIO_DLKM += audio_bolero_cdc.ko

AUDIO_DLKM += audio_wsa_macro.ko

AUDIO_DLKM += audio_va_macro.ko

AUDIO_DLKM += audio_rx_macro.ko

AUDIO_DLKM += audio_tx_macro.ko

AUDIO_DLKM += audio_machine_kona.ko

AUDIO_DLKM += audio_snd_event.ko



PRODUCT_PACKAGES += $(AUDIO_DLKM)



ifneq ($(strip $(TARGET_USES_RRO)), true)

#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
@@ -132,6 +213,19 @@ persist.vendor.audio.fluence.voicerec=false\ 
persist.vendor.audio.fluence.speaker=true\

persist.vendor.audio.fluence.tmic.enabled=false



#

#snapdragon value add features

#

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.ssr=false



##fluencetype can be "fluence" or "fluencepro" or "none"

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.fluencetype=none\

persist.audio.fluence.voicecall=true\

persist.audio.fluence.voicerec=false\

persist.audio.fluence.speaker=true



##speaker protection v3 switch and ADSP AFE API version

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.spv3.enable=true\

configs/lito/lito.mk

+90 −0
Original line number Diff line number Diff line
@@ -81,6 +81,83 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true 
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

##AUDIO_FEATURE_FLAGS



AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.r_submix.default

AUDIO_HARDWARE += audio.primary.lito



#HAL Wrapper

AUDIO_WRAPPER := libqahw

AUDIO_WRAPPER += libqahwwrapper



#HAL Test app

AUDIO_HAL_TEST_APPS := hal_play_test

AUDIO_HAL_TEST_APPS += hal_rec_test



PRODUCT_PACKAGES += $(AUDIO_HARDWARE)

PRODUCT_PACKAGES += $(AUDIO_WRAPPER)

PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)



ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)

BOARD_VENDOR_KERNEL_MODULES := \

    $(KERNEL_MODULES_OUT)/audio_apr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \

    $(KERNEL_MODULES_OUT)/audio_adsp_loader.ko \

    $(KERNEL_MODULES_OUT)/audio_q6.ko \

    $(KERNEL_MODULES_OUT)/audio_usf.ko \

    $(KERNEL_MODULES_OUT)/audio_pinctrl_lpi.ko \

    $(KERNEL_MODULES_OUT)/audio_swr.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd_core.ko \

    $(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa881x.ko \

    $(KERNEL_MODULES_OUT)/audio_platform.ko \

    $(KERNEL_MODULES_OUT)/audio_hdmi.ko \

    $(KERNEL_MODULES_OUT)/audio_stub.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \

    $(KERNEL_MODULES_OUT)/audio_mbhc.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x_slave.ko \

    $(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_va_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_rx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_tx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_native.ko \

    $(KERNEL_MODULES_OUT)/audio_machine_lito.ko \

    $(KERNEL_MODULES_OUT)/audio_snd_event.ko

endif



#Audio DLKM

AUDIO_DLKM := audio_apr.ko

AUDIO_DLKM += audio_q6_pdr.ko

AUDIO_DLKM += audio_q6_notifier.ko

AUDIO_DLKM += audio_adsp_loader.ko

AUDIO_DLKM += audio_q6.ko

AUDIO_DLKM += audio_usf.ko

AUDIO_DLKM += audio_pinctrl_wcd.ko

AUDIO_DLKM += audio_swr.ko

AUDIO_DLKM += audio_wcd_core.ko

AUDIO_DLKM += audio_swr_ctrl.ko

AUDIO_DLKM += audio_wsa881x.ko

AUDIO_DLKM += audio_platform.ko

AUDIO_DLKM += audio_hdmi.ko

AUDIO_DLKM += audio_stub.ko

AUDIO_DLKM += audio_wcd9xxx.ko

AUDIO_DLKM += audio_mbhc.ko

AUDIO_DLKM += audio_native.ko

AUDIO_DLKM += audio_wcd938x.ko

AUDIO_DLKM += audio_wcd938x_slave.ko

AUDIO_DLKM += audio_bolero_cdc.ko

AUDIO_DLKM += audio_wsa_macro.ko

AUDIO_DLKM += audio_va_macro.ko

AUDIO_DLKM += audio_rx_macro.ko

AUDIO_DLKM += audio_tx_macro.ko

AUDIO_DLKM += audio_machine_lito.ko

AUDIO_DLKM += audio_snd_event.ko



PRODUCT_PACKAGES += $(AUDIO_DLKM)



ifneq ($(strip $(TARGET_USES_RRO)), true)

#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
@@ -136,6 +213,19 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
persist.vendor.audio.spv3.enable=true\

persist.vendor.audio.avs.afe_api_version=2



#

#snapdragon value add features

#

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.ssr=false



##fluencetype can be "fluence" or "fluencepro" or "none"

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.fluencetype=none\

persist.audio.fluence.voicecall=true\

persist.audio.fluence.voicerec=false\

persist.audio.fluence.speaker=true



#disable tunnel encoding

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.tunnel.encode=false