commit 152d97e67ba6c164ba4886e90be5d6e06acb9ad2
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon May 06 19:49:56 2019
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 06 19:49:56 2019
tree 3013328a1ea753f6c4922064602c6ebdd417842b
parent 3fd96f7d7d848ce8fc3ff27cb689207d191996ed
parent 7ef71a46f9655d62383619ecb473419a90bacd2d

Merge "Exclude VP9 assemblies from VP8 builds"

vpx_dsp/vpx_dsp.mk

diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk
index 91ce96b..3432507 100644
--- a/vpx_dsp/vpx_dsp.mk
+++ b/vpx_dsp/vpx_dsp.mk
@@ -116,6 +116,7 @@
 
 ifeq ($(HAVE_NEON_ASM),yes)
 DSP_SRCS-yes += arm/vpx_convolve_copy_neon_asm$(ASM)
+ifeq ($(CONFIG_VP9),yes)
 DSP_SRCS-yes += arm/vpx_convolve8_horiz_filter_type2_neon$(ASM)
 DSP_SRCS-yes += arm/vpx_convolve8_vert_filter_type2_neon$(ASM)
 DSP_SRCS-yes += arm/vpx_convolve8_horiz_filter_type1_neon$(ASM)
@@ -128,6 +129,7 @@
 DSP_SRCS-yes += arm/vpx_convolve8_neon_asm.c
 DSP_SRCS-yes += arm/vpx_convolve8_neon_asm.h
 DSP_SRCS-yes += arm/vpx_convolve_neon.c
+endif # CONFIG_VP9
 else
 ifeq ($(HAVE_NEON),yes)
 DSP_SRCS-yes += arm/vpx_convolve_copy_neon.c