aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2016-04-20 23:40:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-20 23:40:45 +0000
commit00fc1c66d5a524c6961db04d05e1076b18003231 (patch)
tree50c787017072a1f8d39f3f004c07643e32fc9c8f
parentc3f7cf7f1b8987a873ceea8c1b45206dd611e425 (diff)
parent2a923c92869efb277ca7d67ab6c27617ec26c128 (diff)
downloadfdk-aac-00fc1c66d5a524c6961db04d05e1076b18003231.tar.gz
fdk-aac-00fc1c66d5a524c6961db04d05e1076b18003231.tar.bz2
fdk-aac-00fc1c66d5a524c6961db04d05e1076b18003231.zip
Merge "Disable warnings that are not easily fixable" am: 8192b1a
am: 2a923c9 * commit '2a923c92869efb277ca7d67ab6c27617ec26c128': Disable warnings that are not easily fixable Change-Id: I920b16bdaa1ce7a00c91e129b950f0d486a1fa37
-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 \