Android: Add NEON/SSE funcs into Headless/UnitTest.

android/jni/Android.mk

@@ -17,6 +17,7 @@ ARCH_FILES := \
   $(SRC)/Common/x64Emitter.cpp \
   $(SRC)/Common/x64Analyzer.cpp \
   $(SRC)/Common/CPUDetect.cpp \
+  $(SRC)/Common/Math/fast/fast_matrix_sse.c \
   $(SRC)/Common/Thunk.cpp \
   $(SRC)/Core/MIPS/x86/CompALU.cpp \
   $(SRC)/Core/MIPS/x86/CompBranch.cpp \
@@ -39,6 +40,7 @@ ARCH_FILES := \
   $(SRC)/Common/x64Emitter.cpp \
   $(SRC)/Common/x64Analyzer.cpp \
   $(SRC)/Common/CPUDetect.cpp \
+  $(SRC)/Common/Math/fast/fast_matrix_sse.c \
   $(SRC)/Common/Thunk.cpp \
   $(SRC)/Core/MIPS/x86/CompALU.cpp \
   $(SRC)/Core/MIPS/x86/CompBranch.cpp \
@@ -62,6 +64,7 @@ ARCH_FILES := \
   $(SRC)/Common/ArmEmitter.cpp \
   $(SRC)/Common/ArmCPUDetect.cpp \
   $(SRC)/Common/ColorConvNEON.cpp.neon \
+  $(SRC)/Common/Math/fast/fast_matrix_neon.S.neon \
   $(SRC)/Core/MIPS/ARM/ArmCompALU.cpp \
   $(SRC)/Core/MIPS/ARM/ArmCompBranch.cpp \
   $(SRC)/Core/MIPS/ARM/ArmCompFPU.cpp \
@@ -76,6 +79,9 @@ ARCH_FILES := \
   $(SRC)/Core/MIPS/ARM/ArmRegCacheFPU.cpp \
   $(SRC)/GPU/Common/VertexDecoderArm.cpp \
   $(SRC)/ext/disarm.cpp \
+  $(SRC)/ext/libpng17/arm/arm_init.c \
+  $(SRC)/ext/libpng17/arm/filter_neon_intrinsics.c \
+  $(SRC)/ext/libpng17/arm/filter_neon.S.neon \
   ArmEmitterTest.cpp
 endif
 
@@ -620,18 +626,6 @@ LOCAL_SRC_FILES := \
 
 ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
 LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM
-LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
-    $(SRC)/Common/Math/fast/fast_matrix_neon.S.neon \
-    $(SRC)/ext/libpng17/arm/arm_init.c \
-    $(SRC)/ext/libpng17/arm/filter_neon_intrinsics.c \
-    $(SRC)/ext/libpng17/arm/filter_neon.S.neon
-
-else ifeq ($(TARGET_ARCH_ABI),x86)
-LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
-    $(SRC)/Common/Math/fast/fast_matrix_sse.c
-else ifeq ($(TARGET_ARCH_ABI),x86_64)
-LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
-    $(SRC)/Common/Math/fast/fast_matrix_sse.c
 endif
 
 ifneq ($(SKIPAPP),1)