From 8144132866650d7793a8249f3c377f8bf03e9242 Mon Sep 17 00:00:00 2001 From: Fritz Koenig Date: Wed, 15 Feb 2012 15:23:04 -0800 Subject: Fix rtcd build process for Android.mk Add a dependency so ndk-build will generate the needed vpx_rtcd.h file. Change-Id: I92c82e0996943dd0403c9956e1ba60e92e2837a9 --- build/make/Android.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'build') diff --git a/build/make/Android.mk b/build/make/Android.mk index 9dbbac9b7..8c21da20c 100644 --- a/build/make/Android.mk +++ b/build/make/Android.mk @@ -118,6 +118,10 @@ $(ASM_CNV_PATH)/libvpx/%.asm.s: $(LIBVPX_PATH)/%.asm $(ASM_CNV_OFFSETS_DEPEND) @mkdir -p $(dir $@) @$(CONFIG_DIR)/$(ASM_CONVERSION) <$< > $@ +# 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 @@ -171,6 +175,7 @@ clean: @$(RM) $(CODEC_SRCS_ASM_ADS2GAS) $(CODEC_SRCS_ASM_NEON_ADS2GAS) @$(RM) $(patsubst %.asm, %.*, $(ASM_CNV_OFFSETS_DEPEND)) @$(RM) -r $(ASM_CNV_PATH) + @$(RM) $(CLEAN-OBJS) include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3