From 319c9da2583a10adf22f47865c1f9b81c787943e Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@trand>
Date: Mon, 5 Mar 2012 19:07:49 -0800
Subject: [PATCH] add -pre-clean that invokes the jni's 'make clean'

---
 xwords4/android/XWords4-dbg/build.xml | 6 ++++++
 xwords4/android/XWords4/build.xml     | 6 ++++++
 xwords4/android/scripts/arelease.sh   | 3 +--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/XWords4-dbg/build.xml b/xwords4/android/XWords4-dbg/build.xml
index 648b99617..bd032d3d9 100644
--- a/xwords4/android/XWords4-dbg/build.xml
+++ b/xwords4/android/XWords4-dbg/build.xml
@@ -49,6 +49,12 @@
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
 
+    <target name="-pre-clean">
+        <exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null" >
+            <arg value="clean"/>
+        </exec>
+      </target>
+
     <target name="-pre-build">
         <exec dir="." executable="../scripts/mkvariant.sh" output="/dev/null" >
             <arg value="--variant-name"/>
diff --git a/xwords4/android/XWords4/build.xml b/xwords4/android/XWords4/build.xml
index 10246e391..fadaa26a4 100644
--- a/xwords4/android/XWords4/build.xml
+++ b/xwords4/android/XWords4/build.xml
@@ -49,6 +49,12 @@
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
 
+    <target name="-pre-clean">
+        <exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null">
+            <arg value="clean"/>
+        </exec>
+      </target>
+
     <target name="-pre-build">
         <exec dir="." executable="../scripts/ndkbuild.sh" >
             <arg value="-j3"/>
diff --git a/xwords4/android/scripts/arelease.sh b/xwords4/android/scripts/arelease.sh
index 6de4bd4e7..100c0ce64 100755
--- a/xwords4/android/scripts/arelease.sh
+++ b/xwords4/android/scripts/arelease.sh
@@ -16,9 +16,8 @@ usage() {
 do_build() {
     WD=$(pwd)
     cd $(dirname $0)/../${VARIANT}/
-    touch jni/Android.mk
     rm -rf bin/ gen/
-    ant release
+    ant clean release
     cd $WD
 }