xw4dbg -> xw4d: tired of typing the extra letters

Rename the debug variant and make it work. appID stays the same and so
no longer matches. Gradle allows that.

xwords4/android/app/build.gradle

@@ -3,7 +3,7 @@ import groovy.swing.SwingBuilder
 def INITIAL_CLIENT_VERS = 8
 def VERSION_CODE_BASE = 114
 def VERSION_NAME = '4.4.118'
-def VARIANTS = [ "xw4", "xw4dbg" ]
+def VARIANTS = [ "xw4", "xw4d" ]
 def BUILDS = [ "Debug", "Release" ]
 def GITREV = "git describe --tags --dirty".execute().text.trim()
 
@@ -47,16 +47,16 @@ android {
     productFlavors {
         xw4 {
             dimension "variant"
-            applicationId "org.eehouse.android.${VARIANTS[0]}"
+            applicationId "org.eehouse.android.xw4"
             manifestPlaceholders = [ APP_ID: applicationId ]
             resValue "string", "app_name", "CrossWords"
             resValue "string", "nbs_port", "3344"
             resValue "string", "invite_prefix", "/and/"
             buildConfigField "boolean", "WIDIR_ENABLED", "false"
         }
-        xw4dbg {
+        xw4d {
             dimension "variant"
-            applicationId "org.eehouse.android.${VARIANTS[1]}"
+            applicationId "org.eehouse.android.xw4dbg"
             manifestPlaceholders = [ APP_ID: applicationId ]
             resValue "string", "app_name", "CrossDbg"
             resValue "string", "nbs_port", "3345"
@@ -134,12 +134,12 @@ android {
                 jniLibs.srcDir "../libs-debug-xw4"
             }
         }
-        xw4dbg {
+        xw4d {
             release {
-                jniLibs.srcDir "../libs-release-xw4dbg"
+                jniLibs.srcDir "../libs-release-xw4d"
             }
             debug {
-                jniLibs.srcDir "../libs-debug-xw4dbg"
+                jniLibs.srcDir "../libs-debug-xw4d"
             }
         }
     }
@@ -164,7 +164,7 @@ dependencies {
 
     compile 'com.android.support:support-v4:23.4.0'
 
-    xw4dbgCompile 'com.crittercism:crittercism-android-agent:+'
+    xw4dCompile 'com.crittercism:crittercism-android-agent:+'
 }
 
 task mkImages(type: Exec) {
@@ -212,12 +212,12 @@ afterEvaluate {
         }
     }
 
-    String copyStringsTask = "copyStringsXw4Dbg"
+    String copyStringsTask = "copyStringsXw4D"
     task "$copyStringsTask"(type: Exec) {
                 workingDir './'
                 environment.put('APPNAME', 'CrossDbg')
                 commandLine 'make', '-f', '../scripts/Variant.mk',
-                "src/xw4dbg/res/values/strings.xml"
+                "src/xw4d/res/values/strings.xml"
             }
     preBuild.dependsOn copyStringsTask
 }

xwords4/android/jni/andutils.c

@@ -756,7 +756,7 @@ android_debugf( const char* format, ... )
     (void)__android_log_write( ANDROID_LOG_DEBUG, 
 # if defined VARIANT_xw4
                                "xw4"
-# elif defined VARIANT_xw4dbg
+# elif defined VARIANT_xw4d
                                "x4bg"
 # endif
                                , buf );

xwords4/android/jni/xwjni.c

@@ -650,7 +650,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_comms_1getUUID
 #ifdef XWFEATURE_BLUETOOTH
 # if defined VARIANT_xw4
         (*env)->NewStringUTF( env, XW_BT_UUID )
-# elif defined VARIANT_xw4dbg
+# elif defined VARIANT_xw4d
         (*env)->NewStringUTF( env, XW_BT_UUID_DBG )
 # endif
 #else