From e4dc2b92483e1738dabf2cf97742995b9f55f039 Mon Sep 17 00:00:00 2001 From: Attila Nagy Date: Wed, 11 Apr 2012 15:20:13 +0300 Subject: [PATCH] Fix vpx_rtcd.h dependency in Android.mk Failed to build on Linux (as described in Android.mk) with NDK r7b. Set vpx_rtcd.h dependency after libvpx sources are added to LOCAL_SRC_FILES so that vpx_rtcd.h is generated before any libvpx file is touched. Change-Id: Ibe19d485ca9f679dc084044df0e3fb14587c4d3e --- build/make/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/make/Android.mk b/build/make/Android.mk index 8c21da2..bb07e30 100644 --- a/build/make/Android.mk +++ b/build/make/Android.mk @@ -121,7 +121,6 @@ $(ASM_CNV_PATH)/libvpx/%.asm.s: $(LIBVPX_PATH)/%.asm $(ASM_CNV_OFFSETS_DEPEND) # For building vpx_rtcd.h, which has a rule in libs.mk TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN))) target := libs -$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vpx_rtcd.h LOCAL_SRC_FILES += vpx_config.c @@ -169,6 +168,8 @@ LOCAL_LDLIBS := -llog LOCAL_STATIC_LIBRARIES := cpufeatures +$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vpx_rtcd.h + .PHONY: clean clean: @echo "Clean: ads2gas files [$(TARGET_ARCH_ABI)]" -- 2.7.4