Merge "Bypass compilation errors due to compiler upgrade"

10 files changed, 14 insertions, 1 deletions

diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk
index 00d71067..33663db4 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)
 # ---------------------------------------------------------------------------------
@@ -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
 
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 ee6b4395..4ae85635 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 14a2b707..572e6129 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-g711/qdsp6/Android.mk b/mm-audio/aenc-g711/qdsp6/Android.mk
index d2dc9d12..cdab6420 100644
--- a/mm-audio/aenc-g711/qdsp6/Android.mk
+++ b/mm-audio/aenc-g711/qdsp6/Android.mk
@@ -16,6 +16,8 @@ libOmxG711Enc-def += -D_DEBUG
 libOmxG711Enc-def += -Wconversion
 libOmxG711Enc-def += -DAUDIOV2
 
+libOmxG711Enc-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 (libOmxG711Enc)
 # ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-g711/qdsp6/inc/aenc_svr.h b/mm-audio/aenc-g711/qdsp6/inc/aenc_svr.h
index 24132e13..1fefc9dc 100644
--- a/mm-audio/aenc-g711/qdsp6/inc/aenc_svr.h
+++ b/mm-audio/aenc-g711/qdsp6/inc/aenc_svr.h
@@ -37,6 +37,7 @@ extern "C" {
 #include <utils/Log.h>
 
 #ifdef _ANDROID_
+#undef LOG_TAG
 #define LOG_TAG "QC_G711ENC"
 #endif
 
diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
index b88c348c..b36b8c18 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