summaryrefslogtreecommitdiffstats
path: root/libvpx.mk
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2015-08-25 11:05:01 -0700
committerVignesh Venkatasubramanian <vigneshv@google.com>2015-10-19 18:20:40 +0000
commit7ce0a1d1337c01056ba24006efab21f00e179e04 (patch)
tree149789b855abffb1fc6aa96cb7afefe0420a9b12 /libvpx.mk
parent4ec72fb10684276b048d5b3a6ba7a88d43b06411 (diff)
downloadandroid_external_libvpx-7ce0a1d1337c01056ba24006efab21f00e179e04.tar.gz
android_external_libvpx-7ce0a1d1337c01056ba24006efab21f00e179e04.tar.bz2
android_external_libvpx-7ce0a1d1337c01056ba24006efab21f00e179e04.zip
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 (cherry picked from commit da49e34c1fb5e99681f4ad99c21d9cfd83eddb96)
Diffstat (limited to 'libvpx.mk')
-rw-r--r--libvpx.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/libvpx.mk b/libvpx.mk
index af19650..f1f194f 100644
--- a/libvpx.mk
+++ b/libvpx.mk
@@ -29,14 +29,14 @@ include $(LOCAL_PATH)/config.$(TARGET_ARCH).mk
LOCAL_SRC_FILES_$(TARGET_ARCH) := $(libvpx_codec_srcs_c_$(TARGET_ARCH))
LOCAL_C_INCLUDES_$(TARGET_ARCH) := $(libvpx_config_dir_$(TARGET_ARCH))
libvpx_2nd_arch :=
-include $(LOCAL_PATH)/libvpx-offsets.mk
+include $(LOCAL_PATH)/libvpx-asm-translation.mk
ifdef TARGET_2ND_ARCH
include $(LOCAL_PATH)/config.$(TARGET_2ND_ARCH).mk
LOCAL_SRC_FILES_$(TARGET_2ND_ARCH) := $(libvpx_codec_srcs_c_$(TARGET_2ND_ARCH))
LOCAL_C_INCLUDES_$(TARGET_2ND_ARCH) := $(libvpx_config_dir_$(TARGET_2ND_ARCH))
libvpx_2nd_arch := $(TARGET_2ND_ARCH_VAR_PREFIX)
-include $(LOCAL_PATH)/libvpx-offsets.mk
+include $(LOCAL_PATH)/libvpx-asm-translation.mk
libvpx_2nd_arch :=
endif