changes to run under gradle

xwords4/android/XWords4/.gitignore

@@ -1,3 +1,4 @@
+*.apk
 .DS_Store
 .gradle
 /.idea/libraries
@@ -7,12 +8,13 @@
 /libs-debug
 /libs-release
 /local.properties
-*.apk
+/obj-debug
+/obj-release
 ant_out.txt
-local.properties
 bin
 gen
 libs
-proguard.cfg
+local.properties
 obj
+proguard.cfg
 res/drawable*/*gen.png

xwords4/android/scripts/gen_gcmid.sh

@@ -4,6 +4,31 @@ set -e -u
 
 GCM_SENDER_ID=${GCM_SENDER_ID:-""}
 CRITTERCISM_APP_ID=${CRITTERCISM_APP_ID:-""}
+OUTFILE=""
+VARIANT=""
+
+usage() {
+	echo "usage: $0 -o outfile -v <variant>"
+	exit 1
+}
+
+while [ $# -gt 0 ]; do
+	case $1 in
+		-o)
+			OUTFILE=$2
+			shift
+			;;
+		-v)
+			VARIANT=$2
+			shift
+			;;
+		*)
+			echo "unexpected param $1"
+			usage
+			;;
+	esac
+	shift
+done
 
 if [ -z "$GCM_SENDER_ID" ]; then
     echo "GCM_SENDER_ID empty; GCM use will be disabled" >&2
@@ -12,9 +37,12 @@ if [ -z "$CRITTERCISM_APP_ID" ]; then
     echo "CRITTERCISM_APP_ID empty; Crittercism will not be enabled" >&2
 fi
 
-PKG=$1
+[ -z "$VARIANT" ] && usage
+[ -z "$OUTFILE" ] && usage
 
-cat <<EOF
+PKG=$VARIANT
+
+cat <<EOF > $OUTFILE
 // Auto-generated: DO NOT CHECK THIS IN until questions about
 // obscuring various ids are cleared up. For now they're not meant 
 // to be committed to public repos.

xwords4/android/scripts/ndksetup.sh

@@ -9,9 +9,7 @@ XWORDS_DEBUG_X86ONLY=${XWORDS_DEBUG_X86ONLYx:-""}
 
 echo "# Generated by $0; do not edit!!!" > $TMP_MK
 
-if [ "$1" = "release" ]; then
-    echo "APP_ABI := armeabi x86" >> $TMP_MK
-elif [ -n "$XWORDS_DEBUG_ARMONLY" ]; then
+if [ -n "$XWORDS_DEBUG_ARMONLY" ]; then
     echo "APP_ABI := armeabi" >> $TMP_MK
 elif [ -n "$XWORDS_DEBUG_X86ONLY" ]; then
     echo "APP_ABI :=  x86" >> $TMP_MK