From: Venkatarama NG. Avadhani <venkatarama.avadhani@ittiam.com>
Date: Thu, 2 May 2019 04:37:54 +0000 (+0530)
Subject: Exclude VP9 assemblies from VP8 builds
X-Git-Tag: v1.8.1~72^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ef71a46f9655d62383619ecb473419a90bacd2d;p=libvpx

Exclude VP9 assemblies from VP8 builds

Add a macro to to exclude VP9 specific assembly files from build if VP9
is not configured. This would otherwise cause a linking error for VP8
only builds.

BUG=webm:1625

Change-Id: I6d892b7c2837a2574538d18b776fd2b6d706da96
---

diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk
index 91ce96bb6..343250702 100644
--- a/vpx_dsp/vpx_dsp.mk
+++ b/vpx_dsp/vpx_dsp.mk
@@ -116,6 +116,7 @@ DSP_SRCS-$(HAVE_NEON)  += arm/vpx_scaled_convolve8_neon.c
 
 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_convolve_avg_neon_asm$(ASM)
 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