aboutsummaryrefslogtreecommitdiff
path: root/libvpx/libs.mk
diff options
context:
space:
mode:
authorhkuang <hkuang@google.com>2013-08-06 11:07:19 -0700
committerHangyu Kuang <hkuang@google.com>2013-08-06 18:31:37 +0000
commitf3bed9137f66ef693bd406e43b17e9a1114f1e14 (patch)
treecd1bea0cd923c6d125cb5b3e7b3404d7c2f70208 /libvpx/libs.mk
parenta8b927ab4f06e2fc0d16d9606b57672df9899ac1 (diff)
downloadlibvpx-f3bed9137f66ef693bd406e43b17e9a1114f1e14.tar.gz
Roll latest libvpx into Android.android-4.4_r0.8android-4.4_r0.7
The latest libvpx just added initial multithread vp9 decoding support and more neon optimization. Checkout is from master branch(hash:33afddadb9af6569bd8296ef1d48d0511b651e9d). Change-Id: I54be2f48bc033c00876b6b1d0a3ff1eccb92a2fa
Diffstat (limited to 'libvpx/libs.mk')
-rw-r--r--libvpx/libs.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/libvpx/libs.mk b/libvpx/libs.mk
index 4aa7dc48a..233863108 100644
--- a/libvpx/libs.mk
+++ b/libvpx/libs.mk
@@ -57,6 +57,13 @@ CLEAN-OBJS += $$(BUILD_PFX)$(1).h
RTCD += $$(BUILD_PFX)$(1).h
endef
+# x86inc.asm is not compatible with pic 32bit builds. Restrict
+# files which use it to 64bit builds or 32bit without pic
+USE_X86INC = no
+ifeq ($(CONFIG_USE_X86INC),yes)
+ USE_X86INC = yes
+endif
+
CODEC_SRCS-yes += CHANGELOG
CODEC_SRCS-yes += libs.mk