shithub: libvpx

Info  •  Files  •  Log  •  Branches

test/android/Android.mk: fix build w/ENABLE_SHARED=0

add a dependency on *_rtcd.h to ensure they're generated before
attempting to build the test files

Change-Id: Ibbbd1f6ea77912bfd297129e7c83b9a80923ea12

--- 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)