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

Commit 5e4472f6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio: Fix compilation error for encoders"

parents 4f3c0d44 e1e6ca16

configs/sdm845/sdm845.mk

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true 
AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

AUDIO_FEATURE_ENABLED_SSR := true

AUDIO_FEATURE_ENABLED_SSR := false

AUDIO_FEATURE_ENABLED_DTS_EAGLE := false

BOARD_USES_SRS_TRUEMEDIA := false

DTS_CODEC_M_ := false
@@ -31,7 +31,7 @@ AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false 
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true

AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := false

DOLBY_ENABLE := false

TARGET_USES_QCOM_MM_AUDIO := true

endif

mm-audio/aenc-aac/qdsp6/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ LOCAL_MODULE := libOmxAacEnc 
LOCAL_MODULE_TAGS        := optional

LOCAL_VENDOR_MODULE      := true

LOCAL_CFLAGS            := $(libOmxAacEnc-def)

LOCAL_CFLAGS            := -Wno-format -Wno-sign-compare -Wno-sign-conversion -Wno-self-assign -Wno-parentheses-equality

LOCAL_C_INCLUDES        := $(libOmxAacEnc-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libutils liblog
@@ -59,6 +60,7 @@ mm-aac-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore 
LOCAL_MODULE            := mm-aenc-omxaac-test

LOCAL_MODULE_TAGS       := optional

LOCAL_CFLAGS            := $(libOmxAacEnc-def)

LOCAL_CFLAGS            := -Wno-unused-local-typedef -Wno-shorten-64-to-32

LOCAL_C_INCLUDES        := $(mm-aac-enc-test-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libmm-omxcore

mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
#include "QOMX_AudioExtensions.h"

#include "QOMX_AudioIndexExtensions.h"

#include <linux/ioctl.h>

#include <errno.h>



typedef unsigned char uint8;

typedef unsigned char byte;

mm-audio/aenc-amrnb/qdsp6/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ LOCAL_MODULE := libOmxAmrEnc 
LOCAL_MODULE_TAGS        := optional

LOCAL_VENDOR_MODULE     := true

LOCAL_CFLAGS            := $(libOmxAmrEnc-def)

LOCAL_CFLAGS            := -Wno-format -Wno-sign-compare -Wno-sign-conversion -Wno-self-assign -Wno-parentheses-equality -Wno-tautological-compare

LOCAL_C_INCLUDES        := $(libOmxAmrEnc-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libutils liblog
@@ -61,6 +62,7 @@ mm-amr-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore 
LOCAL_MODULE            := mm-aenc-omxamr-test

LOCAL_MODULE_TAGS       := optional

LOCAL_CFLAGS            := $(libOmxAmrEnc-def)

LOCAL_CFLAGS            := -Wno-tautological-compare -Wno-unused-local-typedef

LOCAL_C_INCLUDES        := $(mm-amr-enc-test-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libmm-omxcore

mm-audio/aenc-evrc/qdsp6/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ LOCAL_MODULE := libOmxEvrcEnc 
LOCAL_MODULE_TAGS        := optional

LOCAL_VENDOR_MODULE      := true

LOCAL_CFLAGS            := $(libOmxEvrcEnc-def)

LOCAL_CFLAGS            := -Wno-format -Wno-sign-compare -Wno-sign-conversion -Wno-self-assign -Wno-parentheses-equality

LOCAL_C_INCLUDES        := $(libOmxEvrcEnc-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libutils liblog
@@ -60,6 +61,7 @@ mm-evrc-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore 
LOCAL_MODULE            := mm-aenc-omxevrc-test

LOCAL_MODULE_TAGS       := optional

LOCAL_CFLAGS            := $(libOmxEvrcEnc-def)

LOCAL_CFLAGS            := -Wno-unused-local-typedef -Wno-shorten-64-to-32

LOCAL_C_INCLUDES        := $(mm-evrc-enc-test-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libmm-omxcore