From: James Zern Date: Fri, 25 Nov 2016 01:51:10 +0000 (-0800) Subject: build/make/Android.mk: correct rtcd template var refs X-Git-Tag: v1.6.1~64^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a58e0b2a74b76fc218ac6a4ceffe7a8ec77557d7;p=libvpx build/make/Android.mk: correct rtcd template var refs the expansion of findstring and rtcd_dep_template_CONFIG_ASM_ABIS needs to be deferred until the block is parsed as makefile syntax rather than eval time where rtcd_dep_template_CONFIG_ASM_ABIS will be unset. this ensures vpx_config.asm is properly created. Change-Id: I7c38c6c082da78397936467482789dd468adc316 --- diff --git a/build/make/Android.mk b/build/make/Android.mk index c73a780e4..a88f90056 100644 --- a/build/make/Android.mk +++ b/build/make/Android.mk @@ -202,7 +202,7 @@ $$(rtcd_dep_template_SRCS): vpx_scale_rtcd.h $$(rtcd_dep_template_SRCS): vpx_dsp_rtcd.h rtcd_dep_template_CONFIG_ASM_ABIS := x86 x86_64 armeabi-v7a -ifneq ($(findstring $(TARGET_ARCH_ABI),$(rtcd_dep_template_CONFIG_ASM_ABIS)),) +ifneq ($$(findstring $(TARGET_ARCH_ABI),$$(rtcd_dep_template_CONFIG_ASM_ABIS)),) $$(rtcd_dep_template_SRCS): vpx_config.asm endif endef