libvpx: Pull from upstream
Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06
Includes security fixes and performance improvements. Also removed the VP10
related code from the upstream repository.
BUG=23452792
Change-Id: I97452dff5b1f0756e19d621111797363cc533d46
diff --git a/config.arm.mk b/config.arm.mk
index 3f0f0b7..6ae58b8 100644
--- a/config.arm.mk
+++ b/config.arm.mk
@@ -4,13 +4,15 @@
# libvpx_codec_srcs_asm_arm
ifeq ($(ARCH_ARM_HAVE_NEON),true)
-libvpx_target := armv7a-neon
+libvpx_target := config/arm-neon
else ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
-libvpx_target := armv7a
+libvpx_target := config/arm
else
-libvpx_target := generic
+libvpx_target := config/generic
endif
+LOCAL_ARM_MODE := arm
+
libvpx_config_dir_arm := $(LOCAL_PATH)/$(libvpx_target)
libvpx_codec_srcs := $(sort $(shell cat $(libvpx_config_dir_arm)/libvpx_srcs.txt))
@@ -19,4 +21,4 @@
$(filter %.c, $(libvpx_codec_srcs)))) \
$(libvpx_target)/vpx_config.c
-libvpx_codec_srcs_asm_arm := $(filter %.asm.s, $(libvpx_codec_srcs))
+libvpx_codec_srcs_asm_arm := $(filter %.asm, $(libvpx_codec_srcs))