Updated xml files so that android project updater doesn't overwrite build script claiming it's too old

tests/build.properties

@@ -1,19 +1,4 @@
-# This file is used to override default values used by the Ant build system.
-# 
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
+# astrid-tests build properties
 
 tested.project.dir=../astrid
 

tests/build.xml

@@ -1,62 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="astrid-test" default="help">
+<project name="astrid-tests" default="help">
 
-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked in in Version
+         Control Systems. -->
     <property file="local.properties" />
 
     <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
+         by the 'android' tool. This is the place to change some of the default property values
+         used by the Ant rules.
          Here are some properties you may want to change/update:
 
+         application.package
+             the name of your application package as defined in the manifest. Used by the
+             'uninstall' rule.
          source.dir
-             The name of the source directory. Default is 'src'.
+             the name of the source directory. Default is 'src'.
          out.dir
-             The name of the output directory. Default is 'bin'.
+             the name of the output directory. Default is 'bin'.
 
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
+         Properties related to the SDK location or the project target should be updated
+          using the 'android' tool with the 'update' action.
 
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
+         This file is an integral part of the build system for your application and
+         should be checked in in Version Control Systems.
 
          -->
     <property file="build.properties" />
 
-    <!-- The default.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
+    <!-- The default.properties file is created and updated by the 'android' tool, as well
+         as ADT.
+         This file is an integral part of the build system for your application and
+         should be checked in in Version Control Systems. -->
     <property file="default.properties" />
 
-
     <!-- Required pre-setup import -->
     <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
 
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+      <classpath>
+        <pathelement location="antlib/ant-contrib-1.0b3.jar"/>
+      </classpath>
+    </taskdef>
+
+    <taskdef name="setup"
+        classname="com.android.ant.SetupTask"
+        classpathref="android.antlibs" />
+
+    <!-- Execute the Android Setup task that will setup some properties specific to the target,
+         and import the build rules files.
 
          The rules file is imported from
-            <SDK>/tools/ant/
-         Depending on the project type it can be either:
-         - main_rules.xml
-         - lib_rules.xml
-         - test_rules.xml
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <setup> task.
-             - customize it to your needs.
-         - Customize the whole script.
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />.
-             - customize to your needs.
+            <SDK>/platforms/<target_platform>/templates/android_rules.xml
+
+         To customize some build steps for your project:
+         - copy the content of the main node <project> from android_rules.xml
+         - paste it in this build.xml below the <setup /> task.
+         - disable the import by changing the setup task below to <setup import="false" />
+
+         This will ensure that the properties are setup correctly but that your customized
+         build steps are used.
     -->
     <setup />
 
@@ -123,5 +126,5 @@
       <delete file="coverage.em" />
       <echo>Saving the report file in ${basedir}/coverage/coverage.[html/xml]</echo>
     </target>
-    
+
 </project>