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 +++++---------
 jni/Application.mk |  3 ++-
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'jni')

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
diff --git a/jni/Application.mk b/jni/Application.mk
index f05229c..81ea664 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1 +1,2 @@
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := all
+NDK_TOOLCHAIN_VERSION := 4.9
-- 
cgit v1.2.3