summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-09-09 17:36:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-09 17:36:03 +0000
commit4803bf75f564e5c9304527a5b902711f78e9f621 (patch)
tree3dd76eae030149f5f0105f113c4fa29e6a50121f
parent2decc77814e729df47464a504123f9b398ac7077 (diff)
parent9428e080cc72db76594774d03c9250e7bf627fc9 (diff)
downloadfdk-aac-dabplus-4803bf75f564e5c9304527a5b902711f78e9f621.tar.gz
fdk-aac-dabplus-4803bf75f564e5c9304527a5b902711f78e9f621.tar.bz2
fdk-aac-dabplus-4803bf75f564e5c9304527a5b902711f78e9f621.zip
Merge "Ignore Clang warning on checking address of arrays."
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index f804089..5556bdc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,6 +53,11 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/libSBRdec/include \
$(LOCAL_PATH)/libSBRenc/include
+# In tpdec_asc.cpp: address of array 'pPce->FrontElementIsCpe'
+# will always evaluate to 'true'.
+LOCAL_CPPFLAGS += \
+ -Wno-pointer-bool-conversion
+
LOCAL_MODULE:= libFraunhoferAAC
include $(BUILD_STATIC_LIBRARY)