Hook up building arm assembly in the generic linux and android makefiles

build/platform-android.mk

@@ -15,6 +15,11 @@ ifeq ($(ARCH), arm)
   endif
     LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8
     APP_ABI = armeabi-v7a
+  ifeq (Yes, $(USE_ASM))
+    ASM_ARCH = arm
+    CFLAGS += -DHAVE_NEON
+    ASMFLAGS += -march=armv7-a -mfpu=neon
+  endif
 else
     GCCPATHPREFIX = x86
     GCCPREFIX = i686-linux-android

build/platform-arch.mk

@@ -1,3 +1,9 @@
 ifneq ($(filter %86 x86_64, $(ARCH)),)
 include build/platform-x86-common.mk
 endif
+ifneq ($(filter-out arm64, $(filter arm%, $(ARCH))),)
+ifeq ($(USE_ASM), Yes)
+ASM_ARCH = arm
+CFLAGS += -DHAVE_NEON
+endif
+endif

build/platform-linux.mk

@@ -10,4 +10,7 @@ else
 ASMFLAGS += -f elf32
 endif
 endif
+ifeq ($(ASM_ARCH), arm)
+ASMFLAGS += -march=armv7-a -mfpu=neon
+endif