diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-09-12 05:59:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 05:59:24 +0000 |
| commit | 53d779af731f5353d02dd36f90259465c6846c2b (patch) | |
| tree | 962626b417382c87ba7dfab37c6737790fef4691 | |
| parent | 96907bb2db8383d06970a5d23163bfcbc50f8089 (diff) | |
| parent | 84a1738586b1f041adec40fa593eafea51f69fb8 (diff) | |
| download | webrtc-53d779af731f5353d02dd36f90259465c6846c2b.tar.gz | |
am 84a17385: Merge "Disable clang compiler or suppress warning."
* commit '84a1738586b1f041adec40fa593eafea51f69fb8':
Disable clang compiler or suppress warning.
| -rw-r--r-- | src/modules/audio_coding/codecs/isac/fix/source/Android.mk | 3 | ||||
| -rw-r--r-- | src/modules/audio_coding/codecs/isac/main/source/Android.mk | 3 | ||||
| -rw-r--r-- | src/modules/audio_processing/agc/Android.mk | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk index 922800f681..151138bdf3 100644 --- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk @@ -92,6 +92,9 @@ ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) include $(CLEAR_VARS) +# filters_neon.c does not compile with Clang, http://b/17457665. +LOCAL_CLANG := false + LOCAL_ARM_MODE := arm LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := libwebrtc_isacfix_neon diff --git a/src/modules/audio_coding/codecs/isac/main/source/Android.mk b/src/modules/audio_coding/codecs/isac/main/source/Android.mk index 14a555a350..d96c163928 100644 --- a/src/modules/audio_coding/codecs/isac/main/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/main/source/Android.mk @@ -50,6 +50,9 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) +LOCAL_CLANG_CFLAGS := \ + -Wno-tautological-pointer-compare + LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) diff --git a/src/modules/audio_processing/agc/Android.mk b/src/modules/audio_processing/agc/Android.mk index 6fd7d38b9b..21e943ffc6 100644 --- a/src/modules/audio_processing/agc/Android.mk +++ b/src/modules/audio_processing/agc/Android.mk @@ -24,6 +24,9 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) +LOCAL_CLANG_CFLAGS := \ + -Wno-tautological-pointer-compare + LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips) |