From 03efa3a7e6f7006bfb3293f9e01820b1aa3f174e Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 9 Jun 2016 21:30:04 -0700
Subject: [PATCH] toward being able to do release builds of CrossDbg

---
 xwords4/android/XWords4-dbg/AndroidManifest.xml |  2 +-
 xwords4/android/XWords4-dbg/build.xml           |  6 +++---
 xwords4/android/XWords4/build.xml               | 11 ++++++++---
 xwords4/android/scripts/arelease.sh             |  4 ++++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml
index 95d505523..41fd85faa 100644
--- a/xwords4/android/XWords4-dbg/AndroidManifest.xml
+++ b/xwords4/android/XWords4-dbg/AndroidManifest.xml
@@ -54,7 +54,7 @@
   <application android:icon="@drawable/icon48x48"
                android:label="@string/app_name"
                android:name=".XWApp"
-               android:debuggable="true"
+               android:debuggable="false"
                >
 
     <activity android:name="Main"
diff --git a/xwords4/android/XWords4-dbg/build.xml b/xwords4/android/XWords4-dbg/build.xml
index 5dd70eb32..88f6292c1 100644
--- a/xwords4/android/XWords4-dbg/build.xml
+++ b/xwords4/android/XWords4-dbg/build.xml
@@ -52,8 +52,8 @@
     />
 
 
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
+    <!-- extension targets. Uncomment the ones where you want to do custom work
+         in between standard targets -->
 
     <property name="INITIAL_CLIENT_VERS" value="8"/>
     <property name="VARIANT_NAME" value="xw4dbg"/>
@@ -66,7 +66,7 @@
     <target name="-pre-build" depends="my-copy-src">
         <antcall target="my-pre-build">
             <param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
-            <param name="APP_NAME" value="cWords-DBG"/>
+            <param name="APP_NAME" value="${APP_NAME}"/>
         </antcall>
     </target>
 
diff --git a/xwords4/android/XWords4/build.xml b/xwords4/android/XWords4/build.xml
index a414555a7..4611718c1 100644
--- a/xwords4/android/XWords4/build.xml
+++ b/xwords4/android/XWords4/build.xml
@@ -63,12 +63,17 @@
         <antcall target="my-pre-clean" />
     </target>
 
-    <target name="-pre-build">
-        <antcall target="my-pre-build" />
+    <target name="-pre-build" depends="my-copy-src">
+        <antcall target="my-pre-build">
+            <param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
+            <param name="APP_NAME" value="${APP_NAME}"/>
+        </antcall>
     </target>
 
     <target name="-pre-compile">
-        <antcall target="my-pre-compile" />
+        <antcall target="my-pre-compile">
+            <param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
+        </antcall>
     </target>
 
 <!--
diff --git a/xwords4/android/scripts/arelease.sh b/xwords4/android/scripts/arelease.sh
index 32e8751f8..f25c59dcd 100755
--- a/xwords4/android/scripts/arelease.sh
+++ b/xwords4/android/scripts/arelease.sh
@@ -23,6 +23,10 @@ do_build() {
     cd $WD
 }
 
+if [ -f ./AndroidManifest.xml ]; then # we're in the right directory
+    VARIANT=$(basename $(pwd))
+fi
+
 while [ "$#" -gt 0 ]; do
     case $1 in
         --tag)