summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-12-10 21:33:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-10 21:33:05 +0000
commit5f50eb6e2bb17fe663d240bf4d34e0f574e1995d (patch)
treecbcd1ad7a215b93f1f59122c3a959952cae5dc46
parent73f50d8bb635e4b8697d17227250c209a3d55f24 (diff)
parentbb1f43c64d1a04850df4bcfd9ae1c5537524de45 (diff)
downloadandroid_external_libvpx-5f50eb6e2bb17fe663d240bf4d34e0f574e1995d.tar.gz
android_external_libvpx-5f50eb6e2bb17fe663d240bf4d34e0f574e1995d.tar.bz2
android_external_libvpx-5f50eb6e2bb17fe663d240bf4d34e0f574e1995d.zip
am bb1f43c6: am 4d59fcfb: Merge "Suppress clang warning until upstream fix."
* commit 'bb1f43c64d1a04850df4bcfd9ae1c5537524de45': Suppress clang warning until upstream fix.
-rw-r--r--libvpx.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/libvpx.mk b/libvpx.mk
index 1aecad2..af19650 100644
--- a/libvpx.mk
+++ b/libvpx.mk
@@ -7,6 +7,9 @@ LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
LOCAL_CLANG_ASFLAGS := \
-Wa,-I$(TARGET_OUT_INTERMEDIATES)/STATIC_LIBRARIES/libvpx_intermediates/vp8/encoder
+# vp9_mcomp.c:93:10: error: address of array 'x->nmvsadcost' will always evaluate to 'true'
+LOCAL_CLANG_CFLAGS += -Wno-pointer-bool-conversion
+
libvpx_source_dir := $(LOCAL_PATH)/libvpx
## Arch-common settings