summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-12-09 23:44:08 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-09 23:44:08 +0000
commit4d59fcfbd820e0a43367fb91c49cccaff4655ba6 (patch)
treecbcd1ad7a215b93f1f59122c3a959952cae5dc46
parentacfe8bb381dd96f2a1cfe44c882ecd06fbce27f1 (diff)
parentaea17c0cc319a24814683a417c40df31c5344012 (diff)
downloadandroid_external_libvpx-4d59fcfbd820e0a43367fb91c49cccaff4655ba6.tar.gz
android_external_libvpx-4d59fcfbd820e0a43367fb91c49cccaff4655ba6.tar.bz2
android_external_libvpx-4d59fcfbd820e0a43367fb91c49cccaff4655ba6.zip
Merge "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