aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2016-04-20 23:59:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-20 23:59:17 +0000
commit2a9da6a10b4d9c12e50aadf65b796820bb9b6b2c (patch)
tree50c787017072a1f8d39f3f004c07643e32fc9c8f
parent0d4fdaa2d215913b0e8ea14ef4197456e0333fe7 (diff)
parentfb66dceae5e856648073138305ea59cc4eabf26e (diff)
downloadfdk-aac-2a9da6a10b4d9c12e50aadf65b796820bb9b6b2c.tar.gz
fdk-aac-2a9da6a10b4d9c12e50aadf65b796820bb9b6b2c.tar.bz2
fdk-aac-2a9da6a10b4d9c12e50aadf65b796820bb9b6b2c.zip
Merge "Disable warnings that are not easily fixable" am: 8192b1a am: 2a923c9 am: 00fc1c6
am: fb66dce * commit 'fb66dceae5e856648073138305ea59cc4eabf26e': Disable warnings that are not easily fixable Change-Id: I357fd4fd9aa8400c982959a8041d5c243eb3c430
-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 \