From da301ded7c3b9c769b7cad3341c1cc881bf6046c Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sun, 12 Jul 2015 13:01:48 -0700
Subject: [PATCH] Android build tweaks

    - Build in ARM mode, not Thumb mode (cpu.S is written in common ARM dialect)
    - Include various ABIs (phat APK)
---
 Android/jni/Application.mk | 1 +
 Android/jni/apple2ix.mk    | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 Android/jni/Application.mk

diff --git a/Android/jni/Application.mk b/Android/jni/Application.mk
new file mode 100644
index 00000000..f61cc566
--- /dev/null
+++ b/Android/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := armeabi armeabi-v7a ## TODO : x86
diff --git a/Android/jni/apple2ix.mk b/Android/jni/apple2ix.mk
index a5488e97..5ca3ff61 100644
--- a/Android/jni/apple2ix.mk
+++ b/Android/jni/apple2ix.mk
@@ -12,6 +12,7 @@ include $(COMMON_SOURCES_MK)
 
 LOCAL_MODULE    := libapple2ix
 LOCAL_SRC_FILES := jnihooks.c androidkeys.c
+LOCAL_ARM_MODE  := arm
 LOCAL_CFLAGS    := $(APPLE2_BASE_CFLAGS) -DHEADLESS=0
 LOCAL_LDLIBS    := -llog -landroid -lGLESv2 -lz -lOpenSLES