Merge "Bypass compilation errors due to compiler upgrade"
diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk
index 00d7106..33663db 100644
--- a/mm-audio/aenc-aac/qdsp6/Android.mk
+++ b/mm-audio/aenc-aac/qdsp6/Android.mk
@@ -16,6 +16,7 @@
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_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 9bc7200..688d4b7 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 @@
#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 ee6b439..4ae8563 100644
--- a/mm-audio/aenc-amrnb/qdsp6/Android.mk
+++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk
@@ -16,6 +16,8 @@
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 782641b..6a3edf0 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 @@
#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 14a2b70..572e612 100644
--- a/mm-audio/aenc-evrc/qdsp6/Android.mk
+++ b/mm-audio/aenc-evrc/qdsp6/Android.mk
@@ -16,6 +16,8 @@
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 46f40ee..c5e9541 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 @@
#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 d2dc9d1..cdab642 100644
--- a/mm-audio/aenc-g711/qdsp6/Android.mk
+++ b/mm-audio/aenc-g711/qdsp6/Android.mk
@@ -16,6 +16,8 @@
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 24132e1..1fefc9d 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 @@
#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 b88c348..b36b8c1 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk
+++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
@@ -16,6 +16,8 @@
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 940d863..6ddd08d 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 @@
#include <utils/Log.h>
#ifdef _ANDROID_
+#undef LOG_TAG
#define LOG_TAG "QC_QCELP13ENC"
#endif
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 848c857..69b0000 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -14,6 +14,7 @@
LOCAL_CFLAGS += -Wno-unused-function
LOCAL_CFLAGS += -Wno-unused-local-typedef
LOCAL_CFLAGS += -Wno-format
+LOCAL_CFLAGS += -Wno-unused-value
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true)
LOCAL_CFLAGS += -DAFE_PROXY_ENABLED
diff --git a/visualizer/Android.mk b/visualizer/Android.mk
index 33d1e63..de36909 100644
--- a/visualizer/Android.mk
+++ b/visualizer/Android.mk
@@ -21,6 +21,8 @@
LOCAL_CFLAGS+= -O2 -fvisibility=hidden
+LOCAL_CFLAGS += -Wno-unused-variable -Wno-unused-parameter -Wno-gnu-designator -Wno-unused-value -Wno-typedef-redefinition
+
ifneq ($(filter sdm660 sdm845 msm8998 apq8098_latv sdm670 qcs605,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS += -DCAPTURE_DEVICE=7
endif
diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk
index 8a853b6..63db4b1 100644
--- a/voice_processing/Android.mk
+++ b/voice_processing/Android.mk
@@ -3,6 +3,8 @@
# audio preprocessing wrapper
include $(CLEAR_VARS)
+LOCAL_CFLAGS += -Wno-unused-variable -Wno-gnu-designator -Wno-unused-value -Wno-unused-function
+
LOCAL_MODULE:= libqcomvoiceprocessing
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_RELATIVE_PATH := soundfx