ref: c620c632c1de55ca1cfab06ceddcd7d01b3ac54d
parent: 4ded624ff33d1696d43b87d62745b718887cf2c1
parent: 0f8ee6eb4b203f4b034b8979e387780bb4d031ad
author: James Zern <jzern@google.com>
date: Wed Jun 10 15:22:41 EDT 2015
Merge "test/android/Android.mk: fix build w/ENABLE_SHARED=0"
--- a/build/make/Android.mk
+++ b/build/make/Android.mk
@@ -163,6 +163,7 @@
endif
# Add a dependency to force generation of the RTCD files.
+define rtcd_dep_template
ifeq ($(CONFIG_VP8), yes)
$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vp8_rtcd.h
endif
@@ -175,6 +176,9 @@
ifeq ($(TARGET_ARCH_ABI),x86)
$(foreach file, $(LOCAL_SRC_FILES), $(LOCAL_PATH)/$(file)): vpx_config.asm
endif
+endef
+
+$(eval $(call rtcd_dep_template))
.PHONY: clean
clean:
--- a/test/android/Android.mk
+++ b/test/android/Android.mk
@@ -51,4 +51,6 @@
LOCAL_C_INCLUDES := $(BINDINGS_DIR)
FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes)))
LOCAL_SRC_FILES := $(addprefix ./test/, $(FILTERED_SRC))
+# some test files depend on *_rtcd.h, ensure they're generated first.
+$(eval $(call rtcd_dep_template))
include $(BUILD_EXECUTABLE)