summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorFritz Koenig <frkoenig@google.com>2012-02-15 15:23:04 -0800
committerFritz Koenig <frkoenig@google.com>2012-02-15 15:23:04 -0800
commit8144132866650d7793a8249f3c377f8bf03e9242 (patch)
tree2b03a4f7385ef4b0cf2ec7871a9fb3662e1a0f9e /build
parente6df50031e63d812c841a40d2522c487f78ed8ce (diff)
downloadlibvpx-8144132866650d7793a8249f3c377f8bf03e9242.tar
libvpx-8144132866650d7793a8249f3c377f8bf03e9242.tar.gz
libvpx-8144132866650d7793a8249f3c377f8bf03e9242.tar.bz2
libvpx-8144132866650d7793a8249f3c377f8bf03e9242.zip
Fix rtcd build process for Android.mk
Add a dependency so ndk-build will generate the needed vpx_rtcd.h file. Change-Id: I92c82e0996943dd0403c9956e1ba60e92e2837a9
Diffstat (limited to 'build')
-rw-r--r--build/make/Android.mk5
1 files changed, 5 insertions, 0 deletions
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)