ref: e184b613b9684c48385f45c78c160a64061f26fa
parent: 6025c6d65bacea0c72e02ee498bd3e82f92c9141
parent: 21da45e570ad8fa841313614adb4c0f6ab6fac37
author: James Zern <[email protected]>
date: Fri Jul 31 18:22:48 EDT 2015
Merge changes Iecdbbc34,I8b4db93f * changes: Android.mk: fix *_rtcd.h deps for armeabi-v7a Android.mk: add a dep on vpx_config.asm for x86_64
--- a/build/make/Android.mk
+++ b/build/make/Android.mk
@@ -166,17 +166,19 @@
# 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
-ifeq ($(TARGET_ARCH_ABI),x86)
-$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vpx_config.asm
+ifneq ($(findstring $(TARGET_ARCH_ABI),x86 x86_64),)
+$$(rtcd_dep_template_SRCS): vpx_config.asm
endif
endef