From e1629095b6c41d8de26652b36771ad705d150d34 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sun, 29 Nov 2015 14:35:01 -0800
Subject: [PATCH] Get crash symbolication working for x86 build

---
 Android/jni/jnicrash.c | 2 ++
 Android/jni/jnihooks.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Android/jni/jnicrash.c b/Android/jni/jnicrash.c
index 2745687e..582804f3 100644
--- a/Android/jni/jnicrash.c
+++ b/Android/jni/jnicrash.c
@@ -113,6 +113,8 @@ void Java_org_deadc0de_apple2ix_Apple2CrashHandler_nativeProcessCrash(JNIEnv *en
 
         if (android_armArchV7A) {
             asprintf(&symbolsPath, "%s/symbols/armeabi-v7a", data_dir);
+        } else if (android_x86) {
+            asprintf(&symbolsPath, "%s/symbols/x86", data_dir);
         } else /*if (android_armArch)*/ {
             asprintf(&symbolsPath, "%s/symbols/armeabi", data_dir);
         } /*else { moar archs ... } */
diff --git a/Android/jni/jnihooks.c b/Android/jni/jnihooks.c
index c8f1aea2..a7e96a3c 100644
--- a/Android/jni/jnihooks.c
+++ b/Android/jni/jnihooks.c
@@ -102,6 +102,7 @@ static void discover_cpu_family(void) {
     AndroidCpuFamily family = android_getCpuFamily();
     uint64_t features = android_getCpuFeatures();
     if (family == ANDROID_CPU_FAMILY_X86) {
+        android_x86 = true;
         if (features & ANDROID_CPU_X86_FEATURE_SSSE3) {
             LOG("nANDROID_CPU_X86_FEATURE_SSSE3");
             android_x86SSSE3Enabled = true;