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

Commit 7d59ec9c authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge a7fe0f81 on remote branch 

Change-Id: Ie27fcf5c39f7a905ad37847e30a8f8c1abb0dbcb
parents 6b5bd4fd a7fe0f81

Android.mk

+1 −1
Original line number Diff line number Diff line 
ifneq ($(AUDIO_USE_STUB_HAL), true)

ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 sdmshrike msmnile kona lahaina $(MSMSTEPPE) $(TRINKET) atoll lito bengal,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 sdmshrike msmnile kona lahaina holi $(MSMSTEPPE) $(TRINKET) atoll lito bengal,$(TARGET_BOARD_PLATFORM)),)



MY_LOCAL_PATH := $(call my-dir)

audiod/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 


LOCAL_MODULE:= audiod



ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina holi,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_EXECUTABLE)

configs/atoll/atoll.mk

+5 −0
Original line number Diff line number Diff line
@@ -278,6 +278,11 @@ vendor.audio.parser.ip.buffer.size=262144 
PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.flac.sw.decoder.24bit=true



#timeout crash duration set to 20sec before system is ready.

#timeout duration updates to default timeout of 5sec once the system is ready.

PRODUCT_PRODUCT_PROPERTIES += \

vendor.audio.hal.boot.timeout.ms=20000



#split a2dp DSP supported encoder list

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac

configs/atoll/audio_platform_info.xml

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="36" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="36" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />

        <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="37" />

        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" />

configs/atoll/audio_platform_info_intcodec.xml

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="36" />

        <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="36" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />

        <usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="37" />

        <usecase name="USECASE_INCALL_REC_UPLINK" type="in" id="23" />

        <usecase name="USECASE_INCALL_REC_DOWNLINK" type="in" id="23" />