shithub: libvpx

Info  •  Files  •  Log  •  Branches

Android.mk,armv7: fix idct_neon.asm.S creation

force this to be created before any other .S files. this change
additionally removes the file from the source list as it doesn't need to
be compiled on its own.

Change-Id: I6b4cd56ef6059d08f75f06fb749cddf76e0e165e

--- a/build/make/Android.mk

+++ b/build/make/Android.mk

@@ -153,9 +153,12 @@

 LOCAL_SRC_FILES += $(CODEC_SRCS_ASM_ADS2GAS)

 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)

+  ASM_INCLUDES := vpx_dsp/arm/idct_neon.asm.S

   CODEC_SRCS_ASM_NEON = $(foreach v, \

                         $(CODEC_SRCS_ASM_ARM_ALL),\

                         $(if $(findstring neon,$(v)),$(v),))

+  CODEC_SRCS_ASM_NEON := $(filter-out $(addprefix %, $(ASM_INCLUDES)), \

+                         $(CODEC_SRCS_ASM_NEON))

   CODEC_SRCS_ASM_NEON_ADS2GAS = $(patsubst %.S, \

                                 $(ASM_CNV_PATH_LOCAL)/libvpx/%.S, \

                                 $(CODEC_SRCS_ASM_NEON))

@@ -162,6 +165,15 @@

   LOCAL_SRC_FILES += $(patsubst %.S, \

                      %.S.neon, \

                      $(CODEC_SRCS_ASM_NEON_ADS2GAS))

+

+  NEON_ASM_TARGETS = $(patsubst %.S, \

+                     $(ASM_CNV_PATH)/libvpx/%.S, \

+                     $(CODEC_SRCS_ASM_NEON))

+# add a dependency to the full path to the ads2gas output to ensure the

+# includes are converted first.

+ifneq ($(strip $(NEON_ASM_TARGETS)),)

+$(NEON_ASM_TARGETS): $(addprefix $(ASM_CNV_PATH)/libvpx/, $(ASM_INCLUDES))

+endif

 endif

 LOCAL_CFLAGS += \