diff options
| author | James Zern <jzern@google.com> | 2016-11-23 16:49:19 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-11-23 16:49:19 -0800 |
| commit | 2c598d08584816321e9202d18f5ec9c77837408f (patch) | |
| tree | 8c3bd9fb9418fb2b6d51bde577422bcbd5aca2c9 /build | |
| parent | 1136db0db0a40064ec35aac732574c526fa12dec (diff) | |
| download | libvpx-2c598d08584816321e9202d18f5ec9c77837408f.tar libvpx-2c598d08584816321e9202d18f5ec9c77837408f.tar.gz libvpx-2c598d08584816321e9202d18f5ec9c77837408f.tar.bz2 libvpx-2c598d08584816321e9202d18f5ec9c77837408f.zip | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/make/Android.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/build/make/Android.mk b/build/make/Android.mk index 8c83e7222..c73a780e4 100644 --- a/build/make/Android.mk +++ b/build/make/Android.mk @@ -153,15 +153,27 @@ CODEC_SRCS_ASM_ADS2GAS = $(patsubst %.S, \ 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)) 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 += \ |