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

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

Merge "Bypass compilation errors due to compiler upgrade"

parents 7f80e86a ce11235b

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

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ libOmxAacEnc-def += -D_DEBUG 
libOmxAacEnc-def += -Wconversion

libOmxAacEnc-def += -DAUDIOV2



libOmxAacEnc-def += -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-self-assign -Wno-parentheses-equality -Wno-format -Wno-sign-compare -Wno-tautological-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedef

# ---------------------------------------------------------------------------------

#             Make the Shared library (libOmxAacEnc)

# ---------------------------------------------------------------------------------
@@ -32,7 +33,6 @@ LOCAL_CFLAGS := $(libOmxAacEnc-def) 
LOCAL_C_INCLUDES        := $(libOmxAacEnc-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libutils liblog



LOCAL_SRC_FILES         := src/aenc_svr.c

LOCAL_SRC_FILES         += src/omx_aac_aenc.cpp

mm-audio/aenc-aac/qdsp6/inc/aenc_svr.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ extern "C" { 
#include <utils/Log.h>



#ifdef _ANDROID_

#undef LOG_TAG

#define LOG_TAG "QC_AACENC"

#endif

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ libOmxAmrEnc-def += -D_DEBUG 
libOmxAmrEnc-def += -Wconversion

libOmxAmrEnc-def += -DAUDIOV2



libOmxAmrEnc-def += -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-self-assign -Wno-parentheses-equality -Wno-format -Wno-sign-compare -Wno-tautological-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedef



# ---------------------------------------------------------------------------------

#             Make the Shared library (libOmxAmrEnc)

# ---------------------------------------------------------------------------------

mm-audio/aenc-amrnb/qdsp6/inc/aenc_svr.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ extern "C" { 
#include <utils/Log.h>



#ifdef _ANDROID_

#undef LOG_TAG

#define LOG_TAG "QC_AMRENC"

#endif

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ libOmxEvrcEnc-def += -D_DEBUG 
libOmxEvrcEnc-def += -Wconversion

libOmxEvrcEnc-def += -DAUDIOV2



libOmxEvrcEnc-def += -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-self-assign -Wno-parentheses-equality -Wno-format -Wno-sign-compare -Wno-tautological-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedef



# ---------------------------------------------------------------------------------

#             Make the Shared library (libOmxEvrcEnc)

# ---------------------------------------------------------------------------------