From ea07a1e148789469da89bb4e1de91dc0422b13c6 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Wed, 4 Apr 2018 14:18:44 -0500 Subject: Fix up android jni makefiles Arm asm fails to compile with clang, so force gcc for jni --- jni/Android.mk | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'jni/Android.mk') diff --git a/jni/Android.mk b/jni/Android.mk index 2e2517d..324a646 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,5 +1,10 @@ LOCAL_PATH := $(call my-dir) +ARM_ASM = 0 +SOURCES := +DEFINES := +COMMON_DEFINES := + include $(CLEAR_VARS) LOCAL_MODULE := retro @@ -8,18 +13,9 @@ ifeq ($(TARGET_ARCH),arm) ARM_ASM = 1 ASM_CPU = 0 ASM_SPC700 = 0 -LOCAL_CFLAGS += -DANDROID_ARM LOCAL_ARM_MODE := arm endif -ifeq ($(TARGET_ARCH),x86) -LOCAL_CFLAGS += -DANDROID_X86 -endif - -ifeq ($(TARGET_ARCH),mips) -LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ -endif - ifeq ($(NDK_DEBUG),1) DEBUG = 1 endif -- cgit v1.2.3