Merge "Suppress non-critical warnings in webrtc."
diff --git a/android-webrtc.mk b/android-webrtc.mk
index f64a92d..a0dfd65 100644
--- a/android-webrtc.mk
+++ b/android-webrtc.mk
@@ -44,3 +44,32 @@
#MY_WEBRTC_COMMON_DEFS_arm += \
# '-DWEBRTC_ARCH_ARM_V7A'
#endif
+
+# The following warnings are disabled in most webrtc modules,
+# until we upgrade to newer cleaner upstream webrtc.
+MY_WEBRTC_COMMON_CFLAGS_WARNINGS := \
+ -Wno-missing-field-initializers \
+ -Wno-unused-parameter \
+
+# The following clang-tidy checks are disabled in most webrtc modules,
+# until we upgrade to newer cleaner upstream webrtc.
+MY_WEBRTC_COMMON_TIDY_CHECKS := \
+ -cert-*, \
+ -clang-analyzer-*, \
+ -hicpp-*, \
+ -llvm-*, \
+ -google-build-namespaces, \
+ -google-default-arguments, \
+ -google-explicit-constructor, \
+ -google-runtime-int, \
+ -google-runtime-operator, \
+ -misc-incorrect-roundings, \
+ -misc-macro-parentheses, \
+ -misc-misplaced-widening-cast, \
+ -misc-noexcept-move-constructor, \
+ -misc-suspicious-string-compare, \
+ -misc-unused-parameters, \
+ -misc-unused-using-decls, \
+ -performance-type-promotion-in-math-fn, \
+ -performance-unnecessary-copy-initialization, \
+ -performance-unnecessary-value-param, \
diff --git a/webrtc/base/Android.mk b/webrtc/base/Android.mk
index 33ce5b6..069e22b 100644
--- a/webrtc/base/Android.mk
+++ b/webrtc/base/Android.mk
@@ -41,7 +41,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := \
diff --git a/webrtc/common_audio/Android.mk b/webrtc/common_audio/Android.mk
index 7e68367..31f4b30 100644
--- a/webrtc/common_audio/Android.mk
+++ b/webrtc/common_audio/Android.mk
@@ -47,7 +47,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := \
diff --git a/webrtc/common_audio/resampler/Android.mk b/webrtc/common_audio/resampler/Android.mk
index 1aa4dd2..5ddef2d 100644
--- a/webrtc/common_audio/resampler/Android.mk
+++ b/webrtc/common_audio/resampler/Android.mk
@@ -37,7 +37,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
diff --git a/webrtc/common_audio/signal_processing/Android.mk b/webrtc/common_audio/signal_processing/Android.mk
index 5b2a41a..97319c6 100644
--- a/webrtc/common_audio/signal_processing/Android.mk
+++ b/webrtc/common_audio/signal_processing/Android.mk
@@ -58,7 +58,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
diff --git a/webrtc/common_audio/vad/Android.mk b/webrtc/common_audio/vad/Android.mk
index f310cd4..2b328de 100644
--- a/webrtc/common_audio/vad/Android.mk
+++ b/webrtc/common_audio/vad/Android.mk
@@ -35,7 +35,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
index c409af2..7fdc534 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
@@ -75,7 +75,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../interface \
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk
index 835c318..d6a03a0 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk
@@ -27,7 +27,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../include \
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
index e9bfbbb..f1d3074 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
@@ -58,7 +58,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../include \
diff --git a/webrtc/modules/audio_processing/Android.mk b/webrtc/modules/audio_processing/Android.mk
index e768471..4ed43eb 100644
--- a/webrtc/modules/audio_processing/Android.mk
+++ b/webrtc/modules/audio_processing/Android.mk
@@ -49,7 +49,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
@@ -102,7 +103,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
@@ -165,7 +167,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
diff --git a/webrtc/modules/audio_processing/aec/Android.mk b/webrtc/modules/audio_processing/aec/Android.mk
index dbc5ed1..39b2df4 100644
--- a/webrtc/modules/audio_processing/aec/Android.mk
+++ b/webrtc/modules/audio_processing/aec/Android.mk
@@ -39,7 +39,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
diff --git a/webrtc/modules/audio_processing/aecm/Android.mk b/webrtc/modules/audio_processing/aecm/Android.mk
index 6f4ac2e..b327bb3 100644
--- a/webrtc/modules/audio_processing/aecm/Android.mk
+++ b/webrtc/modules/audio_processing/aecm/Android.mk
@@ -37,7 +37,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
diff --git a/webrtc/modules/audio_processing/agc/Android.mk b/webrtc/modules/audio_processing/agc/Android.mk
index ef75e86..a9f7456 100644
--- a/webrtc/modules/audio_processing/agc/Android.mk
+++ b/webrtc/modules/audio_processing/agc/Android.mk
@@ -39,7 +39,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
diff --git a/webrtc/modules/audio_processing/beamformer/Android.mk b/webrtc/modules/audio_processing/beamformer/Android.mk
index 4edce26..e900a54 100644
--- a/webrtc/modules/audio_processing/beamformer/Android.mk
+++ b/webrtc/modules/audio_processing/beamformer/Android.mk
@@ -34,7 +34,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := \
diff --git a/webrtc/modules/audio_processing/intelligibility/Android.mk b/webrtc/modules/audio_processing/intelligibility/Android.mk
index 5328c89..265e580 100644
--- a/webrtc/modules/audio_processing/intelligibility/Android.mk
+++ b/webrtc/modules/audio_processing/intelligibility/Android.mk
@@ -33,7 +33,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := \
diff --git a/webrtc/modules/audio_processing/ns/Android.mk b/webrtc/modules/audio_processing/ns/Android.mk
index 6370f4b..773a7cf 100644
--- a/webrtc/modules/audio_processing/ns/Android.mk
+++ b/webrtc/modules/audio_processing/ns/Android.mk
@@ -39,7 +39,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
diff --git a/webrtc/modules/audio_processing/transient/Android.mk b/webrtc/modules/audio_processing/transient/Android.mk
index d35fb2a..c027009 100644
--- a/webrtc/modules/audio_processing/transient/Android.mk
+++ b/webrtc/modules/audio_processing/transient/Android.mk
@@ -36,7 +36,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := \
diff --git a/webrtc/modules/audio_processing/utility/Android.mk b/webrtc/modules/audio_processing/utility/Android.mk
index ac76b95..9d9974d 100644
--- a/webrtc/modules/audio_processing/utility/Android.mk
+++ b/webrtc/modules/audio_processing/utility/Android.mk
@@ -32,7 +32,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := \
diff --git a/webrtc/modules/audio_processing/vad/Android.mk b/webrtc/modules/audio_processing/vad/Android.mk
index d3e1328..6ac938a 100644
--- a/webrtc/modules/audio_processing/vad/Android.mk
+++ b/webrtc/modules/audio_processing/vad/Android.mk
@@ -39,7 +39,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES := \
diff --git a/webrtc/system_wrappers/source/Android.mk b/webrtc/system_wrappers/source/Android.mk
index c808611..93ee0a6 100644
--- a/webrtc/system_wrappers/source/Android.mk
+++ b/webrtc/system_wrappers/source/Android.mk
@@ -48,7 +48,8 @@
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
+LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \
