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

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

Merge 64f92068 on remote branch 

Change-Id: Id7cc5302bda0f67895f4b9a03d818f071be232d1
parents 94d100a9 64f92068

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/bengal/audio_platform_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_LOW_LATENCY" type="out" id="9"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD" type="out" id="7"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD2" type="out" id="11"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD3" type="out" id="12"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD3" type="out" id="39"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD4" type="out" id="24"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD5" type="out" id="25"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD6" type="out" id="26"/>

configs/bengal/audio_platform_info_intcodec.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_LOW_LATENCY" type="out" id="9"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD" type="out" id="7"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD2" type="out" id="11"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD3" type="out" id="12"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD3" type="out" id="39"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD4" type="out" id="24"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD5" type="out" id="25"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD6" type="out" id="26"/>

configs/bengal/audio_platform_info_qrd.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_LOW_LATENCY" type="out" id="9"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD" type="out" id="7"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD2" type="out" id="11"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD3" type="out" id="12"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD3" type="out" id="39"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD4" type="out" id="24"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD5" type="out" id="25"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD6" type="out" id="26"/>