Apply neon flags to intrinsic files
Filter out files ending in _neon.c and append .neon so the Android build
system knows to apply -mfpu=neon
Change-Id: Ib67277e5920bfcaeda7c4aa16cd1001b11d59305
diff --git a/build/make/Android.mk b/build/make/Android.mk
index 1ff0884..48a0dd7 100644
--- a/build/make/Android.mk
+++ b/build/make/Android.mk
@@ -135,10 +135,14 @@
# Pull out C files. vpx_config.c is in the immediate directory and
# so it does not need libvpx/ prefixed like the rest of the source files.
+# The neon files with intrinsics need to have .neon appended so the proper
+# flags are applied.
CODEC_SRCS_C = $(filter %.c, $(CODEC_SRCS_UNIQUE))
-LOCAL_CODEC_SRCS_C = $(filter-out vpx_config.c, $(CODEC_SRCS_C))
+LOCAL_NEON_SRCS_C = $(filter %_neon.c, $(CODEC_SRCS_C))
+LOCAL_CODEC_SRCS_C = $(filter-out vpx_config.c %_neon.c, $(CODEC_SRCS_C))
LOCAL_SRC_FILES += $(foreach file, $(LOCAL_CODEC_SRCS_C), libvpx/$(file))
+LOCAL_SRC_FILES += $(foreach file, $(LOCAL_NEON_SRCS_C), libvpx/$(file).neon)
# Pull out assembly files, splitting NEON from the rest. This is
# done to specify that the NEON assembly files use NEON assembler flags.
diff --git a/vp8/common/arm/neon/bilinearpredict_neon_intrinsics.c b/vp8/common/arm/neon/bilinearpredict_neon.c
similarity index 100%
rename from vp8/common/arm/neon/bilinearpredict_neon_intrinsics.c
rename to vp8/common/arm/neon/bilinearpredict_neon.c
diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk
index 0d13367..a2127c9 100644
--- a/vp8/vp8_common.mk
+++ b/vp8/vp8_common.mk
@@ -188,7 +188,7 @@
VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM)
# common (neon intrinsics)
-VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/bilinearpredict_neon_intrinsics.c
+VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/bilinearpredict_neon.c
$(eval $(call rtcd_h_template,vp8_rtcd,vp8/common/rtcd_defs.sh))
