diff options
-rw-r--r-- | mm-audio/aenc-aac/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-aac/qdsp6/inc/aenc_svr.h | 1 | ||||
-rw-r--r-- | mm-audio/aenc-amrnb/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-amrnb/qdsp6/inc/aenc_svr.h | 1 | ||||
-rw-r--r-- | mm-audio/aenc-evrc/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-evrc/qdsp6/inc/aenc_svr.h | 1 | ||||
-rw-r--r-- | mm-audio/aenc-qcelp13/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-qcelp13/qdsp6/inc/aenc_svr.h | 1 |
8 files changed, 11 insertions, 1 deletions
diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk index 87e7f277..eef5c1c3 100644 --- a/mm-audio/aenc-aac/qdsp6/Android.mk +++ b/mm-audio/aenc-aac/qdsp6/Android.mk @@ -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) # --------------------------------------------------------------------------------- @@ -33,7 +34,6 @@ LOCAL_CFLAGS += -Wno-error 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 diff --git a/mm-audio/aenc-aac/qdsp6/inc/aenc_svr.h b/mm-audio/aenc-aac/qdsp6/inc/aenc_svr.h index 9bc72009..688d4b73 100644 --- a/mm-audio/aenc-aac/qdsp6/inc/aenc_svr.h +++ b/mm-audio/aenc-aac/qdsp6/inc/aenc_svr.h @@ -36,6 +36,7 @@ extern "C" { #include <utils/Log.h> #ifdef _ANDROID_ +#undef LOG_TAG #define LOG_TAG "QC_AACENC" #endif diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk index 084751b0..289743c1 100644 --- a/mm-audio/aenc-amrnb/qdsp6/Android.mk +++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk @@ -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) # --------------------------------------------------------------------------------- diff --git a/mm-audio/aenc-amrnb/qdsp6/inc/aenc_svr.h b/mm-audio/aenc-amrnb/qdsp6/inc/aenc_svr.h index 782641b5..6a3edf08 100644 --- a/mm-audio/aenc-amrnb/qdsp6/inc/aenc_svr.h +++ b/mm-audio/aenc-amrnb/qdsp6/inc/aenc_svr.h @@ -36,6 +36,7 @@ extern "C" { #include <utils/Log.h> #ifdef _ANDROID_ +#undef LOG_TAG #define LOG_TAG "QC_AMRENC" #endif diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk index 3a43e206..64acd08b 100644 --- a/mm-audio/aenc-evrc/qdsp6/Android.mk +++ b/mm-audio/aenc-evrc/qdsp6/Android.mk @@ -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) # --------------------------------------------------------------------------------- diff --git a/mm-audio/aenc-evrc/qdsp6/inc/aenc_svr.h b/mm-audio/aenc-evrc/qdsp6/inc/aenc_svr.h index 46f40ee3..c5e95414 100644 --- a/mm-audio/aenc-evrc/qdsp6/inc/aenc_svr.h +++ b/mm-audio/aenc-evrc/qdsp6/inc/aenc_svr.h @@ -36,6 +36,7 @@ extern "C" { #include <utils/Log.h> #ifdef _ANDROID_ +#undef LOG_TAG #define LOG_TAG "QC_EVRCENC" #endif diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk index a1912062..7b9e008b 100644 --- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk +++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk @@ -16,6 +16,8 @@ libOmxQcelp13Enc-def += -D_DEBUG libOmxQcelp13Enc-def += -Wconversion libOmxQcelp13Enc-def += -DAUDIOV2 +libOmxQcelp13Enc-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 (libOmxQcelp13Enc) # --------------------------------------------------------------------------------- diff --git a/mm-audio/aenc-qcelp13/qdsp6/inc/aenc_svr.h b/mm-audio/aenc-qcelp13/qdsp6/inc/aenc_svr.h index 940d863a..6ddd08d2 100644 --- a/mm-audio/aenc-qcelp13/qdsp6/inc/aenc_svr.h +++ b/mm-audio/aenc-qcelp13/qdsp6/inc/aenc_svr.h @@ -36,6 +36,7 @@ extern "C" { #include <utils/Log.h> #ifdef _ANDROID_ +#undef LOG_TAG #define LOG_TAG "QC_QCELP13ENC" #endif |