diff --git a/xwords4/android/scripts/ndksetup.sh b/xwords4/android/scripts/ndksetup.sh
index 3368d2bd6..855ff932c 100755
--- a/xwords4/android/scripts/ndksetup.sh
+++ b/xwords4/android/scripts/ndksetup.sh
@@ -10,7 +10,7 @@ XWORDS_DEBUG_ARMONLY=${XWORDS_DEBUG_ARMONLY:-""}
 XWORDS_DEBUG_X86ONLY=${XWORDS_DEBUG_X86ONLYx:-""}
 
 usage() {
-	echo "usage $0 [--with-clang]"
+	echo "usage $0 [--with-clang] [--arm-only|--x86-only]"
 	exit 1
 }
 
@@ -19,6 +19,12 @@ while [ $# -gt 0 ]; do
 		--with-clang)
 			USE_CLANG=1
 			;;
+		--arm-only)
+			XWORDS_DEBUG_ARMONLY=1
+			;;
+		--x86-only)
+			XWORDS_DEBUG_X86ONLY=1
+			;;
 		*)
 			usage "Unexpected param $1"
 			;;
@@ -31,7 +37,7 @@ echo "# Generated by $0; do not edit!!!" > $TMP_MK
 [ -n "$USE_CLANG" ] && echo "NDK_TOOLCHAIN_VERSION := clang" >> $TMP_MK
 
 if [ -n "$XWORDS_DEBUG_ARMONLY" ]; then
-    echo "APP_ABI := armeabi" >> $TMP_MK
+    echo "APP_ABI := armeabi-v7a" >> $TMP_MK
 elif [ -n "$XWORDS_DEBUG_X86ONLY" ]; then
     echo "APP_ABI :=  x86" >> $TMP_MK
 else