aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2016-04-20 19:00:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-20 19:00:07 +0000
commit2a923c92869efb277ca7d67ab6c27617ec26c128 (patch)
treedb2cea97163a35d4843d04ae60793c5e59c99c38
parent27625f27066421ce38250272f4bb751cf6f58c17 (diff)
parent8192b1a98f60cc39253c658ba1ca70a70c2e0dfa (diff)
downloadfdk-aac-2a923c92869efb277ca7d67ab6c27617ec26c128.tar.gz
fdk-aac-2a923c92869efb277ca7d67ab6c27617ec26c128.tar.bz2
fdk-aac-2a923c92869efb277ca7d67ab6c27617ec26c128.zip
Merge "Disable warnings that are not easily fixable"
am: 8192b1a * commit '8192b1a98f60cc39253c658ba1ca70a70c2e0dfa': Disable warnings that are not easily fixable Change-Id: I5dc1fabd29cfb7024f8362359a796efd1764032d
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 4c28670..519e820 100644
--- a/Android.mk
+++ b/Android.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
$(sbrenc_sources:%=libSBRenc/src/%)
LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra
+LOCAL_CFLAGS += "-Wno-\#warnings" -Wno-constant-logical-operand -Wno-self-assign
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/libAACdec/include \