From f1c2eb79d4b840f0aaa74a0bd001fee77652c23d Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 1 Aug 2018 07:37:33 -0700
Subject: [PATCH] remove x86 from jni; that chip's dead on Android

---
 xwords4/android/app/build.gradle    | 2 +-
 xwords4/android/scripts/ndksetup.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 1359656ab..7294f1e78 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -223,7 +223,7 @@ task copyStrings(type: Exec) {
 
 task ndkSetup(type: Exec) {
     workingDir '../'
-    commandLine "./scripts/ndksetup.sh", "--with-clang"
+    commandLine "./scripts/ndksetup.sh", "--with-clang", "--arm-only"
 }
 
 task myPreBuild(dependsOn: ['ndkSetup', 'mkImages', 'copyStrings', 'mkXml']) {
diff --git a/xwords4/android/scripts/ndksetup.sh b/xwords4/android/scripts/ndksetup.sh
index 855ff932c..da0bab45c 100755
--- a/xwords4/android/scripts/ndksetup.sh
+++ b/xwords4/android/scripts/ndksetup.sh
@@ -36,10 +36,11 @@ echo "# Generated by $0; do not edit!!!" > $TMP_MK
 
 [ -n "$USE_CLANG" ] && echo "NDK_TOOLCHAIN_VERSION := clang" >> $TMP_MK
 
+# TODO: reserach whether armeabi-v7a is better here
 if [ -n "$XWORDS_DEBUG_ARMONLY" ]; then
-    echo "APP_ABI := armeabi-v7a" >> $TMP_MK
+    echo "APP_ABI := armeabi" >> $TMP_MK
 elif [ -n "$XWORDS_DEBUG_X86ONLY" ]; then
-    echo "APP_ABI :=  x86" >> $TMP_MK
+    echo "APP_ABI := x86" >> $TMP_MK
 else
     echo "APP_ABI := armeabi x86" >> $TMP_MK
 fi