summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-09-09 17:53:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-09 17:53:16 +0000
commit57daefcbe143f3ce523706b6b107865519bf7aae (patch)
tree670296fd4d9414631b5a6a58823ac3cd2cd25ebf
parent8d8580c267fcf99a7938a90ee6029e2dad8a8426 (diff)
parent4803bf75f564e5c9304527a5b902711f78e9f621 (diff)
downloadfdk-aac-57daefcbe143f3ce523706b6b107865519bf7aae.tar.gz
fdk-aac-57daefcbe143f3ce523706b6b107865519bf7aae.tar.bz2
fdk-aac-57daefcbe143f3ce523706b6b107865519bf7aae.zip
am 4803bf75: Merge "Ignore Clang warning on checking address of arrays."
* commit '4803bf75f564e5c9304527a5b902711f78e9f621': 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)