(android) build fix

Makefile

@@ -69,10 +69,6 @@ else
    CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
 endif
 
-ifeq ($(ARM_ASM), 1)
-CFLAGS += -DARM_ASM
-endif
-
 CORE_DIR     := ./src
 LIBRETRO_DIR := ./libretro
 

Makefile.common

@@ -91,6 +91,10 @@ INCLUDES   = -Ilibretro -Isrc -I.
 DEFINES    += -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline
 DEFINES    += -DUSE_SA1
 
+ifeq ($(ARM_ASM), 1)
+DEFINES += -DARM_ASM
+endif
+
 ifeq ($(platform), sncps3)
 WARNINGS_DEFINES =
 CODE_DEFINES =

jni/Android.mk

@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+ARM_ASM = 1
+
 LOCAL_MODULE    := retro
 
 ifeq ($(TARGET_ARCH),arm)