From 21da45e570ad8fa841313614adb4c0f6ab6fac37 Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 29 Jul 2015 16:07:05 -0700 Subject: [PATCH] Android.mk: fix *_rtcd.h deps for armeabi-v7a strip '.neon' so *_rtcd.h depends on the correct file Change-Id: Iecdbbc34c9ce5c6d0a4b466332d52f4e6a0cb128 --- build/make/Android.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build/make/Android.mk b/build/make/Android.mk index 129e9d7..9eb6dd2 100644 --- a/build/make/Android.mk +++ b/build/make/Android.mk @@ -166,17 +166,19 @@ endif # Add a dependency to force generation of the RTCD files. define rtcd_dep_template +rtcd_dep_template_SRCS := $(addprefix $(LOCAL_PATH)/, $(LOCAL_SRC_FILES)) +rtcd_dep_template_SRCS := $$(rtcd_dep_template_SRCS:.neon=) ifeq ($(CONFIG_VP8), yes) -$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vp8_rtcd.h +$$(rtcd_dep_template_SRCS): vp8_rtcd.h endif ifeq ($(CONFIG_VP9), yes) -$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vp9_rtcd.h +$$(rtcd_dep_template_SRCS): vp9_rtcd.h endif -$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vpx_scale_rtcd.h -$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vpx_dsp_rtcd.h +$$(rtcd_dep_template_SRCS): vpx_scale_rtcd.h +$$(rtcd_dep_template_SRCS): vpx_dsp_rtcd.h ifneq ($(findstring $(TARGET_ARCH_ABI),x86 x86_64),) -$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vpx_config.asm +$$(rtcd_dep_template_SRCS): vpx_config.asm endif endef -- 2.7.4