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

Commit af4cc5ee authored by Manisha Agarwal's avatar Manisha Agarwal
Browse files

audio: Add qssi removed entries for individual targets. 

Add entries of audio-kernel libs and properties removed from
qssi to individual target makefile.

Change-Id: If8a49bcf386ca8ce2a22da2e2d9991d2e0056d67
parent c80b2ffa

configs/msmnile/msmnile.mk

+88 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ BOARD_USES_ALSA_AUDIO := true 
TARGET_USES_AOSP_FOR_AUDIO := false



ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_QSSI_COMPLIANCE := false

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true
@@ -81,6 +80,81 @@ 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.msmnile



#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_wglink.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_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_wcd934x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd9360.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd_spi.ko \

    $(KERNEL_MODULES_OUT)/audio_native.ko \

    $(KERNEL_MODULES_OUT)/audio_machine_msmnile.ko

endif



# install lkdtm only for userdebug and eng build variants

ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

    ifeq (,$(findstring perf_defconfig, $(KERNEL_DEFCONFIG)))

        BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/lkdtm.ko

    endif

endif



#Audio DLKM

AUDIO_DLKM := audio_apr.ko

AUDIO_DLKM += audio_wglink.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_wcd9360.ko

AUDIO_DLKM += audio_wcd_spi.ko

AUDIO_DLKM += audio_native.ko

AUDIO_DLKM += audio_machine_msmnile.ko

AUDIO_DLKM += audio_wcd934x.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
@@ -137,6 +211,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



#disable tunnel encoding

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.tunnel.encode=false

configs/msmsteppe/msmsteppe.mk

+100 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ BOARD_USES_ALSA_AUDIO := true 
TARGET_USES_AOSP_FOR_AUDIO := false



ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false

AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := true
@@ -69,6 +68,93 @@ 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.$(MSMSTEPPE)



#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_snd_event.ko \

    $(KERNEL_MODULES_OUT)/audio_wglink.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_wcd934x.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_wcd_spi.ko \

    $(KERNEL_MODULES_OUT)/audio_native.ko \

    $(KERNEL_MODULES_OUT)/audio_machine_talos.ko

endif



BOARD_VENDOR_KERNEL_MODULES += $(shell ls $(KERNEL_MODULES_OUT)/*.ko)



#Audio DLKM

AUDIO_DLKM := audio_apr.ko

AUDIO_DLKM += audio_snd_event.ko

AUDIO_DLKM += audio_wglink.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_wcd_spi.ko

AUDIO_DLKM += audio_native.ko

AUDIO_DLKM += audio_machine_talos.ko

AUDIO_DLKM += audio_wcd934x.ko

AUDIO_DLKM += audio_pinctrl_lpi.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



PRODUCT_PACKAGES += $(AUDIO_DLKM)



#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
@@ -123,6 +209,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/sdm710/sdm710.mk

+66 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false
@@ -78,6 +77,59 @@ BOARD_SUPPORTS_SOUND_TRIGGER_CPU_AFFINITY_SET := false 
BOARD_SUPPORTS_FFV_EC_THREAD_RT_PRIORITY := false

##AUDIO_FEATURE_FLAGS



AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.r_submix.default

AUDIO_HARDWARE += audio.primary.sdm710



#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)/qca_cld3_wlan.ko \

    $(KERNEL_MODULES_OUT)/audio_apr.ko \

    $(KERNEL_MODULES_OUT)/audio_wglink.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_cpe_lsm.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_wcd_spi.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd_cpe.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd9335.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd934x.ko \

    $(KERNEL_MODULES_OUT)/audio_digital_cdc.ko \

    $(KERNEL_MODULES_OUT)/audio_analog_cdc.ko \

    $(KERNEL_MODULES_OUT)/audio_msm_sdw.ko \

    $(KERNEL_MODULES_OUT)/audio_native.ko \

    $(KERNEL_MODULES_OUT)/audio_machine_sdm710.ko

endif



BOARD_VENDOR_KERNEL_MODULES += \

     $(KERNEL_MODULES_OUT)/llcc_perfmon.ko



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

#Audio Specific device overlays

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

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



# Mutlirec Apptype

PRODUCT_PROPERTY_OVERRIDES += \

    vendor.audio.apptype.multirec.enabled=false \

configs/sdm845/sdm845.mk

+44 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false

AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := false
@@ -66,6 +65,37 @@ AUDIO_FEATURE_ENABLED_SND_MONITOR := true 
AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true

##AUDIO_FEATURE_FLAGS



AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.r_submix.default

AUDIO_HARDWARE += audio.primary.sdm845



#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)



BOARD_VENDOR_KERNEL_MODULES := \

    $(KERNEL_MODULES_OUT)/qca_cld3_wlan.ko \

    $(KERNEL_MODULES_OUT)/wcd-core.ko \

    $(KERNEL_MODULES_OUT)/pinctrl-wcd.ko \

    $(KERNEL_MODULES_OUT)/swr-wcd-ctrl.ko \

    $(KERNEL_MODULES_OUT)/snd-soc-wcd9xxx.ko \

    $(KERNEL_MODULES_OUT)/wcd-dsp-glink.ko \

    $(KERNEL_MODULES_OUT)/snd-soc-wcd934x.ko \

    $(KERNEL_MODULES_OUT)/snd-soc-wcd-mbhc.ko \

    $(KERNEL_MODULES_OUT)/snd-soc-wsa881x.ko \

    $(KERNEL_MODULES_OUT)/snd-soc-sdm845.ko \

    $(KERNEL_MODULES_OUT)/snd-soc-wcd-spi.ko \

    $(KERNEL_MODULES_OUT)/llcc_perfmon.ko



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

#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
@@ -130,6 +160,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



#disable tunnel encoding

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.tunnel.encode=false