From: James Zern <jzern@google.com>
Date: Tue, 1 Nov 2016 01:34:16 +0000 (-0700)
Subject: build/make/Android.mk: fix armeabi-v7a build
X-Git-Tag: v1.6.1~126^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae32318170e09b918269091b95ed82f20130c8e6;p=libvpx

build/make/Android.mk: fix armeabi-v7a build

vpx_config.asm and idct_neon.asm.S are required since:
3ae2597 idct,NEON: add a tran_low_t->s16 load adapter

Change-Id: If5959a25edb370dd7dcdca71c96e9a5aad0840ce
---

diff --git a/build/make/Android.mk b/build/make/Android.mk
index e4ae3629e..2fe618bf4 100644
--- a/build/make/Android.mk
+++ b/build/make/Android.mk
@@ -164,7 +164,8 @@ endif
 LOCAL_CFLAGS += \
     -DHAVE_CONFIG_H=vpx_config.h \
     -I$(LIBVPX_PATH) \
-    -I$(ASM_CNV_PATH)
+    -I$(ASM_CNV_PATH) \
+    -I$(ASM_CNV_PATH)/libvpx
 
 LOCAL_MODULE := libvpx
 
@@ -185,7 +186,8 @@ endif
 $$(rtcd_dep_template_SRCS): vpx_scale_rtcd.h
 $$(rtcd_dep_template_SRCS): vpx_dsp_rtcd.h
 
-ifneq ($(findstring $(TARGET_ARCH_ABI),x86 x86_64),)
+rtcd_dep_template_CONFIG_ASM_ABIS := x86 x86_64 armeabi-v7a
+ifneq ($(findstring $(TARGET_ARCH_ABI),$(rtcd_dep_template_CONFIG_ASM_ABIS)),)
 $$(rtcd_dep_template_SRCS): vpx_config.asm
 endif
 endef