From 5eaaaacaf6cd60e1ca0599e35d218650a2e54198 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 3 Dec 2012 01:29:04 +0100 Subject: [PATCH] (Android) Make Neon compilation optional with a switch --- android/native/jni/Android.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index b32b8a6fbe..ac8f268e00 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -2,6 +2,7 @@ RARCH_VERSION = "0.9.8-beta3" LOCAL_PATH := $(call my-dir) PERF_TEST := 1 HAVE_OPENSL := 1 +WANT_NEON := 0 include $(CLEAR_VARS) @@ -15,10 +16,13 @@ LOCAL_CFLAGS += -DANDROID_X86 -DHAVE_SSSE3 endif ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) -LOCAL_CFLAGS += -DANDROID_ARM_V7 +ifeq ($(WANT_NEON),1) LOCAL_CFLAGS += -DWANT_NEON LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon endif +LOCAL_CFLAGS += -DANDROID_ARM_V7 +endif + ifeq ($(TARGET_ARCH),mips) LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__