diff --git a/libretroBuildSystem/jni/Android.mk b/libretroBuildSystem/jni/Android.mk
index ab1d42a..2e1a230 100644
--- a/libretroBuildSystem/jni/Android.mk
+++ b/libretroBuildSystem/jni/Android.mk
@@ -2,6 +2,16 @@ LOCAL_PATH := $(call my-dir)
 
 CORE_DIR := $(LOCAL_PATH)/..
 
+# prevent persisting in non ARM builds after the first ARM build
+EMU_OPTIMIZE_FOR_ARM32 = 0
+
+# set ASM CPU core, only use with ARMv4<->7, ARMv8 is its own architecture
+ifeq ($(TARGET_ARCH),arm)
+	ifneq ($(TARGET_ARCH_ABI),arm64-v8a)
+		EMU_OPTIMIZE_FOR_ARM32 = 1
+	endif
+endif
+
 include $(CORE_DIR)/build/Makefile.common
 
 COREFLAGS := -ffast-math -funroll-loops -D__LIBRETRO__ -DINLINE=inline -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS) $(COREDEFINES)
@@ -11,13 +21,6 @@ ifneq ($(GIT_VERSION)," unknown")
 	COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
-#set ASM CPU core, only use with ARMv4<->7, ARMv8 is its own architecture
-ifeq ($(TARGET_ARCH),arm)
-	ifneq ($(TARGET_ARCH_ABI),arm64-v8a)
-		EMU_OPTIMIZE_FOR_ARM32 = 1
-	endif
-endif
-
 include $(CLEAR_VARS)
 LOCAL_MODULE    := retro
 LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM)