From d02481879b6c1961aa94f324c35d49a4d155c0b4 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 10 Feb 2014 07:31:52 -0800
Subject: [PATCH] catch debug variant up with recent changes and lay groundwork
 for including crittercism in it.

---
 .../android/XWords4-dbg/AndroidManifest.xml   | 129 ++++++++++++++----
 xwords4/android/XWords4-dbg/build.xml         |  53 +++++--
 .../android/XWords4-dbg/img_src/.gitignore    |  15 ++
 xwords4/android/XWords4-dbg/jni/.gitignore    |   1 +
 .../android/XWords4-dbg/project.properties    |   2 +-
 .../XWords4-dbg/res/drawable-hdpi/.gitignore  |  16 +++
 .../XWords4-dbg/res/drawable-mdpi/.gitignore  |  16 +++
 .../XWords4-dbg/res/drawable-xhdpi/.gitignore |  16 +++
 .../XWords4-dbg/res/drawable/.gitignore       |   4 +
 .../XWords4-dbg/res/layout-small/.gitignore   |   1 +
 .../android/XWords4-dbg/res/layout/.gitignore |   5 +
 .../XWords4-dbg/res/menu-small/.gitignore     |   1 +
 .../android/XWords4-dbg/res/menu/.gitignore   |   2 +
 .../XWords4-dbg/res/values-large/.gitignore   |   1 +
 .../XWords4-dbg/res/values-pt/.gitignore      |   1 +
 .../XWords4-dbg/res/values/app_name.xml       |   2 +-
 .../src/org/eehouse/android/xw4dbg/.gitignore |  31 +++++
 .../eehouse/android/xw4dbg/CrashTrack.java    |  36 +++++
 .../org/eehouse/android/xw4dbg/jni/.gitignore |   1 +
 xwords4/android/scripts/find-and-ant.sh       |   3 +
 20 files changed, 302 insertions(+), 34 deletions(-)
 create mode 100644 xwords4/android/XWords4-dbg/img_src/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res/drawable-hdpi/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res/drawable-mdpi/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res/drawable-xhdpi/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res/layout-small/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res/menu-small/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res/values-large/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res/values-pt/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/CrashTrack.java

diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml
index 7816e1c7e..4afb22b00 100644
--- a/xwords4/android/XWords4-dbg/AndroidManifest.xml
+++ b/xwords4/android/XWords4-dbg/AndroidManifest.xml
@@ -22,19 +22,48 @@
      to come from a domain that you own or have control over. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.eehouse.android.xw4dbg"
-          android:versionCode="34"
+          android:versionCode="72"
           android:versionName="@string/app_version"
           >
 
+  <!-- BE SURE TO MODIFY project.project AND the variable TARGET in
+       ../scripts/setup_local_props.sh if targetSdkVersion changes!!!
+       -->
+  <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="14" />
+
+  <supports-screens android:resizeable="true"
+                    android:smallScreens="true"
+                    android:normalScreens="true"
+                    android:largeScreens="true"
+                    android:xlargeScreens="true"
+                    />
+
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
   <uses-permission android:name="android.permission.VIBRATE" />
-  <!-- <uses-permission android:name="android.permission.RECEIVE_SMS" /> -->
-  <!-- <uses-permission android:name="android.permission.SEND_SMS" /> -->
+  <uses-permission android:name="android.permission.RECEIVE_SMS" /> 
+  <uses-permission android:name="android.permission.SEND_SMS" />
+  <uses-permission android:name="android.permission.READ_SMS" />
+  <uses-permission android:name="android.permission.READ_CONTACTS" />
 
-  <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
+  <uses-feature android:name="android.hardware.telephony"
+                android:required = "false"
+                /> 
+  <uses-feature android:name="android.hardware.nfc" android:required="false" />
+
+  <!-- GCM stuff -->
+  <permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" 
+              android:protectionLevel="signature" />
+  <uses-permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" /> 
+  <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+  <uses-permission android:name="android.permission.NFC" />
+
+  <!-- for crittercism -->
+  <uses-permission android:name="android.permission.GET_TASKS"/>
 
   <application android:icon="@drawable/icon48x48"
                android:label="@string/app_name"
@@ -44,26 +73,39 @@
     <activity android:name="GamesList" 
               android:label="@string/app_name"
               android:launchMode="standard"
-              android:configChanges="keyboardHidden|orientation"
+              android:configChanges="keyboardHidden|orientation|screenSize"
               >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
+
+      <intent-filter>
+        <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:mimeType="@string/xwords_nfc_mime" />
+      </intent-filter>
+
     </activity>
 
     <activity android:name="DictsActivity"
               android:label="@string/title_dicts_list"
-              android:configChanges="keyboardHidden|orientation"
+              android:configChanges="keyboardHidden|orientation|screenSize"
           />
     
     <activity android:name="NewGameActivity"
               android:theme="@android:style/Theme.NoTitleBar"
+              android:configChanges="keyboardHidden|orientation|screenSize"
+              />
+    <activity android:name="SMSInviteActivity"
+              android:theme="@android:style/Theme.Dialog"
+              android:configChanges="keyboardHidden|orientation|screenSize"
+              android:screenOrientation="portrait"
               />
 
     <activity android:name="GameConfig"
               android:screenOrientation="sensor"
-              android:configChanges="keyboardHidden|orientation"
+              android:configChanges="keyboardHidden|orientation|screenSize"
               >
       <intent-filter>
         <action android:name="android.intent.action.EDIT" />
@@ -73,15 +115,22 @@
     <activity android:name="PrefsActivity"
               android:label="@string/title_prefs"
               android:screenOrientation="sensor"
-              >
-    </activity>
+              android:configChanges="keyboardHidden|orientation|screenSize"
+              />
 
     <activity android:name="BoardActivity"
-              android:theme="@android:style/Theme.Light"
               android:screenOrientation="portrait"
               android:configChanges="keyboardHidden"
-              >
-    </activity>
+              />
+
+    <activity android:name="LookupActivity"
+              android:configChanges="keyboardHidden|orientation|screenSize"
+              android:theme="@android:style/Theme.Dialog"
+              />
+
+    <activity android:name="StudyList"
+              android:configChanges="keyboardHidden|orientation|screenSize"
+              />
 
     <receiver android:name="RelayReceiver">
       <intent-filter>
@@ -89,15 +138,37 @@
       </intent-filter>
     </receiver>
 
-    <activity android:name="DispatchNotify"
-              >
+    <receiver android:name="UpdateCheckReceiver">
+      <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED"/>
+      </intent-filter>
+    </receiver>
+
+    <activity android:name="DispatchNotify">
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
-        <action android:name="android.intent.action.EDIT" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
         <data android:scheme="newxwgame"/>
       </intent-filter>
+
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+
+        <data android:scheme="http"
+              android:host="@string/invite_host"
+              android:pathPrefix="@string/invite_prefix"
+              />
+      </intent-filter>
+
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:mimeType="@string/invite_mime" />
+      </intent-filter>
     </activity>
 
     <!-- downloading dicts -->
@@ -119,10 +190,10 @@
 
     <activity android:name="RelayGameActivity"/>
     <activity android:name="DictBrowseActivity"
-              android:configChanges="keyboardHidden|orientation"
+              android:configChanges="keyboardHidden|orientation|screenSize"
               />
     <activity android:name="ChatActivity"
-              android:configChanges="keyboardHidden|orientation"
+              android:configChanges="keyboardHidden|orientation|screenSize"
               />
 
     <service android:name="RelayService"/>
@@ -138,14 +209,24 @@
         </intent-filter>
     </receiver>
 
+    <receiver android:name="SMSReceiver" >
+      <intent-filter android:priority="999" >
+        <action android:name="android.provider.Telephony.SMS_RECEIVED" />
+      </intent-filter>
+    </receiver>
 
-    <!-- <receiver android:name="NBSReceiver"> -->
-    <!--   <intent-filter android:priority="10"> -->
-    <!--     <action android:name="android.intent.action.DATA_SMS_RECEIVED" /> -->
-    <!--     <data android:scheme="sms" /> -->
-    <!--     <data android:port="50009" /> -->
-    <!--   </intent-filter> -->
-    <!-- </receiver> -->
+    <service android:name="SMSService"/>
+
+    <receiver android:name="com.google.android.gcm.GCMBroadcastReceiver" 
+              android:permission="com.google.android.c2dm.permission.SEND" >
+      <intent-filter>
+        <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+        <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+        <category android:name="org.eehouse.android.xw4" />
+      </intent-filter>
+    </receiver>
+
+    <service android:name=".GCMIntentService" />
 
   </application>
 </manifest>
diff --git a/xwords4/android/XWords4-dbg/build.xml b/xwords4/android/XWords4-dbg/build.xml
index bd032d3d9..310d05a71 100644
--- a/xwords4/android/XWords4-dbg/build.xml
+++ b/xwords4/android/XWords4-dbg/build.xml
@@ -49,16 +49,28 @@
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
 
+    <property name="INITIAL_CLIENT_VERS" value="3"/>
     <target name="-pre-clean">
-        <exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null" >
+        <exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null">
+            <arg value="${build.target}"/>
+        </exec>
+        <exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null">
             <arg value="clean"/>
         </exec>
+
+        <exec dir="." executable="../scripts/mkimages.sh" 
+              failonerror="true" >
+          <arg value="--clean"/>
+        </exec>
       </target>
 
     <target name="-pre-build">
-        <exec dir="." executable="../scripts/mkvariant.sh" output="/dev/null" >
+        <exec dir="." executable="../scripts/mkvariant.sh" failonerror="true"
+              output="/dev/null">
             <arg value="--variant-name"/>
             <arg value="xw4dbg"/>
+            <arg value="--app-name"/>
+            <arg value="cWords-DBG"/>
             <arg value="--dest-dir"/>
             <arg value="./res"/>
             <arg value="--dest-dir"/>
@@ -67,15 +79,40 @@
             <arg value="./jni"/>
             <arg value="--dest-dir"/>
             <arg value="./assets"/>
+            <arg value="--dest-dir"/>
+            <arg value="./img_src"/>
         </exec>
-        <exec dir="." executable="../scripts/ndkbuild.sh" >
-            <arg value="-j3"/>
-        </exec>
-        <exec dir=".." executable="./scripts/genvers.sh" output="ant_out.txt">
-            <arg value="XWords4-dbg"/>
-            <arg value="xw4dbg"/>
+        <exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null">
+            <arg value="${build.target}"/>
         </exec>
 
+        <property name="CHAT_ENABLED" value="true" />
+        <property name="THUMBNAIL_ENABLED" value="true" />
+        <exec dir="." executable="../scripts/ndkbuild.sh" failonerror="true">
+            <arg value="BUILD_TARGET=${build.target}" />
+            <arg value="-j3"/>
+            <arg value="INITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS}" />
+            <arg value="CHAT_ENABLED=${CHAT_ENABLED}" />
+            <arg value="THUMBNAIL_ENABLED=${THUMBNAIL_ENABLED}" />
+        </exec>
+
+        <exec dir="." executable="../scripts/mkimages.sh" 
+              failonerror="true" output="/dev/null" 
+              />
+
+        <exec dir="." executable="../scripts/gen_gcmid.sh"
+              output="src/org/eehouse/android/xw4dbg/GCMConsts.java"
+              failonerror="true" logError="true"
+              >
+          <arg value="xw4dbg"/>
+        </exec>
+        <exec dir=".." executable="./scripts/genvers.sh" output="/dev/null">
+            <arg value="XWords4-DBG"/>
+            <arg value="xw4dbg"/>
+            <arg value="${INITIAL_CLIENT_VERS}" />
+            <arg value="${CHAT_ENABLED}" />
+            <arg value="${THUMBNAIL_ENABLED}" />
+        </exec>
     </target>
 <!--
     <target name="-pre-compile">
diff --git a/xwords4/android/XWords4-dbg/img_src/.gitignore b/xwords4/android/XWords4-dbg/img_src/.gitignore
new file mode 100644
index 000000000..96355d851
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/img_src/.gitignore
@@ -0,0 +1,15 @@
+back.svg
+content_copy.svg
+content_discard.svg
+content_new.svg
+dict.svg
+download.svg
+down.svg
+email.svg
+new_group.svg
+prefs.svg
+relabel.svg
+reset.svg
+save.svg
+send.svg
+up.svg
diff --git a/xwords4/android/XWords4-dbg/jni/.gitignore b/xwords4/android/XWords4-dbg/jni/.gitignore
index e6c90d8e7..1c7bf1313 100644
--- a/xwords4/android/XWords4-dbg/jni/.gitignore
+++ b/xwords4/android/XWords4-dbg/jni/.gitignore
@@ -17,3 +17,4 @@ xportwrapper.h
 xptypes.h
 xwjni.c
 paths.h
+Application.mk
diff --git a/xwords4/android/XWords4-dbg/project.properties b/xwords4/android/XWords4-dbg/project.properties
index 5a7094538..730e911f2 100644
--- a/xwords4/android/XWords4-dbg/project.properties
+++ b/xwords4/android/XWords4-dbg/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-7
+target=android-14
diff --git a/xwords4/android/XWords4-dbg/res/drawable-hdpi/.gitignore b/xwords4/android/XWords4-dbg/res/drawable-hdpi/.gitignore
new file mode 100644
index 000000000..bf9e3f65b
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res/drawable-hdpi/.gitignore
@@ -0,0 +1,16 @@
+back__gen.png
+content_copy__gen.png
+content_discard__gen.png
+content_edit.png
+content_new__gen.png
+dict__gen.png
+down__gen.png
+download__gen.png
+email__gen.png
+new_group__gen.png
+prefs__gen.png
+relabel__gen.png
+reset__gen.png
+save__gen.png
+send__gen.png
+up__gen.png
diff --git a/xwords4/android/XWords4-dbg/res/drawable-mdpi/.gitignore b/xwords4/android/XWords4-dbg/res/drawable-mdpi/.gitignore
new file mode 100644
index 000000000..bf9e3f65b
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res/drawable-mdpi/.gitignore
@@ -0,0 +1,16 @@
+back__gen.png
+content_copy__gen.png
+content_discard__gen.png
+content_edit.png
+content_new__gen.png
+dict__gen.png
+down__gen.png
+download__gen.png
+email__gen.png
+new_group__gen.png
+prefs__gen.png
+relabel__gen.png
+reset__gen.png
+save__gen.png
+send__gen.png
+up__gen.png
diff --git a/xwords4/android/XWords4-dbg/res/drawable-xhdpi/.gitignore b/xwords4/android/XWords4-dbg/res/drawable-xhdpi/.gitignore
new file mode 100644
index 000000000..bf9e3f65b
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res/drawable-xhdpi/.gitignore
@@ -0,0 +1,16 @@
+back__gen.png
+content_copy__gen.png
+content_discard__gen.png
+content_edit.png
+content_new__gen.png
+dict__gen.png
+down__gen.png
+download__gen.png
+email__gen.png
+new_group__gen.png
+prefs__gen.png
+relabel__gen.png
+reset__gen.png
+save__gen.png
+send__gen.png
+up__gen.png
diff --git a/xwords4/android/XWords4-dbg/res/drawable/.gitignore b/xwords4/android/XWords4-dbg/res/drawable/.gitignore
index 966262e5f..0e1260b7e 100644
--- a/xwords4/android/XWords4-dbg/res/drawable/.gitignore
+++ b/xwords4/android/XWords4-dbg/res/drawable/.gitignore
@@ -23,3 +23,7 @@ values.png
 zoom.png
 bluetooth_active.png
 bluetooth_disabled.png
+in_arrow_active.png
+in_arrow.png
+out_arrow_active.png
+out_arrow.png
diff --git a/xwords4/android/XWords4-dbg/res/layout-small/.gitignore b/xwords4/android/XWords4-dbg/res/layout-small/.gitignore
new file mode 100644
index 000000000..060ef29f7
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res/layout-small/.gitignore
@@ -0,0 +1 @@
+board.xml
diff --git a/xwords4/android/XWords4-dbg/res/layout/.gitignore b/xwords4/android/XWords4-dbg/res/layout/.gitignore
index f5ea1af08..c650fbeb6 100644
--- a/xwords4/android/XWords4-dbg/res/layout/.gitignore
+++ b/xwords4/android/XWords4-dbg/res/layout/.gitignore
@@ -27,3 +27,8 @@ rename_game.xml
 select_dialog_item.xml
 btinviter_item.xml
 btinviter.xml
+confirm_sms.xml
+game_list_group.xml
+smsinviter_item.xml
+smsinviter.xml
+studylist.xml
diff --git a/xwords4/android/XWords4-dbg/res/menu-small/.gitignore b/xwords4/android/XWords4-dbg/res/menu-small/.gitignore
new file mode 100644
index 000000000..275932284
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res/menu-small/.gitignore
@@ -0,0 +1 @@
+board_menu.xml
diff --git a/xwords4/android/XWords4-dbg/res/menu/.gitignore b/xwords4/android/XWords4-dbg/res/menu/.gitignore
index b5d87f3e2..94293912d 100644
--- a/xwords4/android/XWords4-dbg/res/menu/.gitignore
+++ b/xwords4/android/XWords4-dbg/res/menu/.gitignore
@@ -3,3 +3,5 @@ chat_menu.xml
 dicts_item_menu.xml
 games_list_item_menu.xml
 games_list_menu.xml
+dicts_menu.xml
+studylist.xml
diff --git a/xwords4/android/XWords4-dbg/res/values-large/.gitignore b/xwords4/android/XWords4-dbg/res/values-large/.gitignore
new file mode 100644
index 000000000..684760d58
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res/values-large/.gitignore
@@ -0,0 +1 @@
+styles.xml
diff --git a/xwords4/android/XWords4-dbg/res/values-pt/.gitignore b/xwords4/android/XWords4-dbg/res/values-pt/.gitignore
new file mode 100644
index 000000000..be5186f01
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res/values-pt/.gitignore
@@ -0,0 +1 @@
+strings.xml
diff --git a/xwords4/android/XWords4-dbg/res/values/app_name.xml b/xwords4/android/XWords4-dbg/res/values/app_name.xml
index fb814779c..3e293f402 100644
--- a/xwords4/android/XWords4-dbg/res/values/app_name.xml
+++ b/xwords4/android/XWords4-dbg/res/values/app_name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="app_name">Crossw-dbg</string>
+  <string name="app_version">4.4-dbg beta 76</string>
 </resources>
diff --git a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
index 15f4280e4..efca10358 100644
--- a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
+++ b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
@@ -52,3 +52,34 @@ BTService.java
 MultiMsgSink.java
 GameNamer.java
 LookupActivity.java
+ABUtils.java
+BoardCanvas.java
+BuildConstants.java
+ConnStatusHandler.java
+DlgState.java
+ExpiringDelegate.java
+ExpiringLinearLayout.java
+ExpiringTextView.java
+GameListGroup.java
+GameListItem.java
+GameLock.java
+GCMConsts.java
+GCMIntentService.java
+InviteActivity.java
+MultiService.java
+NFCUtils.java
+SelectableItem.java
+SMSCheckBoxPreference.java
+SMSInviteActivity.java
+SMSListItem.java
+SMSReceiver.java
+SMSService.java
+StudyList.java
+ThumbCanvas.java
+UpdateCheckReceiver.java
+XWExpandableListActivity.java
+XWPrefs.java
+XWService.java
+XWSumListPreference.java
+XWThumbListPreference.java
+#CrashTrack.java#
diff --git a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/CrashTrack.java b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/CrashTrack.java
new file mode 100644
index 000000000..1b2687ed2
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/CrashTrack.java
@@ -0,0 +1,36 @@
+/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
+/*
+ * Copyright 2014 by Eric House (xwords@eehouse.org).  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.eehouse.android.xw4dbg;
+
+import android.content.Context;
+
+// This class exists solely to allow crittercism to be included in a small
+// file that can be different in variants.  GamesList.java is too big.
+import com.crittercism.app.Crittercism;
+
+public class CrashTrack {
+
+    public static void init( Context context ) {
+        if ( 0 < GCMConsts.CRITTERCISM_APP_ID.length() ) {
+            Crittercism.initialize(context.getApplicationContext(), 
+                                   GCMConsts.CRITTERCISM_APP_ID );
+        }
+    }
+}
diff --git a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/jni/.gitignore b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/jni/.gitignore
index 875d14f9d..37a3f31cb 100644
--- a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/jni/.gitignore
+++ b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/jni/.gitignore
@@ -15,3 +15,4 @@ TransportProcs.java
 UtilCtxtImpl.java
 UtilCtxt.java
 XwJNI.java
+BoardDims.java
diff --git a/xwords4/android/scripts/find-and-ant.sh b/xwords4/android/scripts/find-and-ant.sh
index 2f054aae6..0eb278ebc 100755
--- a/xwords4/android/scripts/find-and-ant.sh
+++ b/xwords4/android/scripts/find-and-ant.sh
@@ -35,6 +35,9 @@ case $DIRNAME in
     XWords4-bt)
         PKG=xw4bt
         ;;
+    XWords4-dbg)
+        PKG=xw4dbg
+        ;;
     XWords4)
         PKG=xw4
         ;;