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

Commit 962b06f4 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of audio-userspace.lnx.3.0-00002. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2012222   Ic475b01d9accf5a2641a23198fbbe5a01975601a   configs: enable SVA feature for msm8998 target
2012222   I4df84bbacb34756ad1809a34c95d6492e51e3772   audio: change TARGET_USES_AOSP to TARGET_USES_AOSP_FOR_A
2012222   I724b59d77e6b98d47866776c83bdab0f0333d8fb   msm8996:audio:config: enable audio HIDL component
2012222   I96960f977f1ab74f266aa7a7937c760b6675ca54   Allow split system/vendor image configuration
2012222   I54f24d3e0914db3c9f7da26ea053ee6c5aa91784   policy_hal: update custom audio policy implementation AP
2012222   I4cb2891a3f241ac54830d5e76392ec7219912993   audio:config: enable audio HIDL component
2012222   I292df24a5164775bf8033b85336a247910aea89f   sdm660 :disable additional audio features and add HIDL c

Change-Id: I94210f344627ba1710698bc3b4dd7fef4f665dff
CRs-Fixed: 2012222
parents 29f02c6b 6ac5a7a6

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ include $(MY_LOCAL_PATH)/post_proc/Android.mk 
include $(MY_LOCAL_PATH)/qahw_api/Android.mk

endif



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

include $(MY_LOCAL_PATH)/audiod/Android.mk

endif

configs/msm8937/msm8937.mk

+5 −5
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#BOARD_USES_GENERIC_AUDIO := true

BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

#AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
@@ -60,7 +60,7 @@ BOARD_SUPPORTS_QAHW := true 
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay



# Audio configuration file

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf

else
@@ -69,8 +69,8 @@ PRODUCT_COPY_FILES += \ 
endif



PRODUCT_COPY_FILES +=\

hardware/qcom/audio/configs/msm8937/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf\

hardware/qcom/audio/configs/msm8937/audio_effects.conf:system/vendor/etc/audio_effects.conf\

hardware/qcom/audio/configs/msm8937/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf\

hardware/qcom/audio/configs/msm8937/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf\

hardware/qcom/audio/configs/msm8937/mixer_paths_mtp.xml:system/etc/mixer_paths_mtp.xml \

hardware/qcom/audio/configs/msm8937/mixer_paths_qrd_skuh.xml:system/etc/mixer_paths_qrd_skuh.xml \

hardware/qcom/audio/configs/msm8937/mixer_paths_qrd_skui.xml:system/etc/mixer_paths_qrd_skui.xml \
@@ -96,7 +96,7 @@ hardware/qcom/audio/configs/msm8937/aanc_tuning_mixer.txt:system/etc/aanc_tuning 


#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else

configs/msm8953/msm8953.mk

+5 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#BOARD_USES_GENERIC_AUDIO := true

BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

#AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
@@ -60,7 +60,7 @@ BOARD_SUPPORTS_QAHW := true 
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay



# Audio configuration file

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf

else
@@ -69,8 +69,8 @@ PRODUCT_COPY_FILES += \ 
endif



PRODUCT_COPY_FILES += \

hardware/qcom/audio/configs/msm8953/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \

hardware/qcom/audio/configs/msm8953/audio_effects.conf:system/vendor/etc/audio_effects.conf \

hardware/qcom/audio/configs/msm8953/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \

hardware/qcom/audio/configs/msm8953/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \

hardware/qcom/audio/configs/msm8953/mixer_paths_mtp.xml:system/etc/mixer_paths_mtp.xml \

hardware/qcom/audio/configs/msm8953/mixer_paths_qrd_skuh.xml:system/etc/mixer_paths_qrd_skuh.xml \

hardware/qcom/audio/configs/msm8953/mixer_paths_qrd_skui.xml:system/etc/mixer_paths_qrd_skui.xml \
@@ -95,7 +95,7 @@ hardware/qcom/audio/configs/msm8953/aanc_tuning_mixer.txt:system/etc/aanc_tuning 


#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else

configs/msm8996/msm8996.mk

+12 −5
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#AUDIO_FEATURE_FLAGS

BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true
@@ -59,7 +59,7 @@ BOARD_SUPPORTS_QAHW := true 
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay



# Audio configuration file

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf

else
@@ -68,8 +68,8 @@ PRODUCT_COPY_FILES += \ 
endif



PRODUCT_COPY_FILES += \

    hardware/qcom/audio/configs/msm8996/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \

    hardware/qcom/audio/configs/msm8996/audio_effects.conf:system/vendor/etc/audio_effects.conf \

    hardware/qcom/audio/configs/msm8996/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \

    hardware/qcom/audio/configs/msm8996/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \

    hardware/qcom/audio/configs/msm8996/mixer_paths.xml:system/etc/mixer_paths.xml \

    hardware/qcom/audio/configs/msm8996/mixer_paths_tasha.xml:system/etc/mixer_paths_tasha.xml \

    hardware/qcom/audio/configs/msm8996/mixer_paths_dtp.xml:system/etc/mixer_paths_dtp.xml \
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ 


#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else
@@ -199,3 +199,10 @@ use.qti.sw.ape.decoder=true 
#flac sw decoder 24 bit decode capability

PRODUCT_PROPERTY_OVERRIDES += \

flac.sw.decoder.24bit.support=true



# for HIDL related packages

PRODUCT_PACKAGES += \

    android.hardware.audio@2.0-service \

    android.hardware.audio@2.0-impl \

    android.hardware.audio.effect@2.0-impl \

    android.hardware.soundtrigger@2.0-impl

configs/msm8998/msm8998.mk

+13 −6
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#AUDIO_FEATURE_FLAGS

BOARD_USES_ALSA_AUDIO := true



ifneq ($(TARGET_USES_AOSP), true)

ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true
@@ -34,7 +34,7 @@ AUDIO_FEATURE_ENABLED_3D_AUDIO := true 
endif



USE_XML_AUDIO_POLICY_CONF := 1

BOARD_SUPPORTS_SOUND_TRIGGER_HAL := true

BOARD_SUPPORTS_SOUND_TRIGGER := true

AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true

AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true

AUDIO_FEATURE_ENABLED_ANC_HEADSET := true
@@ -64,7 +64,7 @@ AUDIO_FEATURE_ENABLED_RAS := true 
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay



# Audio configuration file

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf

else
@@ -73,8 +73,8 @@ PRODUCT_COPY_FILES += \ 
endif



PRODUCT_COPY_FILES += \

    hardware/qcom/audio/configs/msm8998/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \

    hardware/qcom/audio/configs/msm8998/audio_effects.conf:system/vendor/etc/audio_effects.conf \

    hardware/qcom/audio/configs/msm8998/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \

    hardware/qcom/audio/configs/msm8998/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \

    hardware/qcom/audio/configs/msm8998/mixer_paths.xml:system/etc/mixer_paths.xml \

    hardware/qcom/audio/configs/msm8998/mixer_paths_tasha.xml:system/etc/mixer_paths_tasha.xml \

    hardware/qcom/audio/configs/msm8998/mixer_paths_tavil.xml:system/etc/mixer_paths_tavil.xml \
@@ -94,7 +94,7 @@ PRODUCT_COPY_FILES += \ 


#XML Audio configuration files

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(TARGET_USES_AOSP), true)

ifeq ($(TARGET_USES_AOSP_FOR_AUDIO), true)

PRODUCT_COPY_FILES += \

    $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml

else
@@ -230,3 +230,10 @@ audio.noisy.broadcast.delay=600 
#offload pausetime out duration to 3 secs to inline with other outputs

PRODUCT_PROPERTY_OVERRIDES += \

audio.offload.pstimeout.secs=3



# for HIDL related packages

PRODUCT_PACKAGES += \

    android.hardware.audio@2.0-service \

    android.hardware.audio@2.0-impl \

    android.hardware.audio.effect@2.0-impl \

    android.hardware.soundtrigger@2.0-impl