build.xml in calabash-android-0.3.4

- old
+ new

@@ -3,11 +3,11 @@
     <description>
       Bits and pieces plucked out of $ANDROID_HOME/tools/ant/build.xml
     </description>
 
     <property name="adb.device.arg" value="" />
-    <property environment="env"/>    
+    <property environment="env"/>
     <property file="build.properties"/>
     <property name="staging.dir" location="staging"/>
     <property name="bin.dir" location="bin"/>
     <property name="test.app.aapt" location="${bin.dir}/Test_aapt.apk"/>
     <property name="dex.file" location="${bin.dir}/classes.dex"/>
@@ -29,20 +29,20 @@
     <taskdef name="xpath" classname="com.android.ant.XPathTask" classpathref="android.antlibs"/>
     <taskdef name="aapt" classname="com.android.ant.AaptExecTask" classpathref="android.antlibs" />
     <taskdef name="apkbuilder" classname="com.android.ant.ApkBuilderTask" classpathref="android.antlibs" />
 
 
-    
 
+
     <path id="jar.libs.ref">
       <fileset dir="${staging.dir}/libs/" includes="*.jar" />
     </path>
 
     <path id="cucumber.path">
       <fileset dir="cucumber/" includes="*.jar" />
     </path>
-    
+
     <path id="android.target.classpath">
       <fileset dir="${env.ANDROID_HOME}/platforms/android-${android.api.level}/" includes="*.jar"/>
     </path>
 
     <target name="-check.preconditions">
@@ -58,14 +58,11 @@
       <antcall target="-prepare.testserver"/>
     </target>
 
     <target name="-prepare.testserver" description="Makes sure the testserver matches the tested application by looking at its manifest file">
       <copy todir="${staging.dir}">
-				<fileset dir="instrumentation-backend">
-          <exclude name="src/sh/calaba/instrumentationbackend/actions/map_unsupported/*.java" if="${google_maps_support}"/>
-          <exclude name="src/sh/calaba/instrumentationbackend/actions/map/*.java" unless="${google_maps_support}"/>
-        </fileset> 
+				<fileset dir="instrumentation-backend" />
       </copy>
       <copy todir="${staging.dir}/libs">
         <fileset erroronmissingdir="false" dir="${env.ANDROID_HOME}/add-ons/addon-google_apis-google_inc_-${android.api.level}/libs"/>
         <fileset erroronmissingdir="false" dir="${env.ANDROID_HOME}/add-ons/addon-google_apis-google-${android.api.level}/libs"/>
       </copy>
@@ -75,11 +72,11 @@
     </target>
 
 
     <target name="-compile">
       <antcall target="-stage" />
-      <javac 
+      <javac
 	       srcdir="${staging.dir}/src"
 	       destdir="${bin.dir}"
 	       verbose="${verbose}"
          source="1.6"
          target="1.6"
@@ -88,18 +85,18 @@
 	       classpath="${extensible.classpath}"
 	       classpathref="jar.libs.ref">
       </javac>
     </target>
 
-    
+
     <target name="package" depends="-check.preconditions">
       <antcall target="-compile" />
       <antcall target="-aapt" />
       <antcall target="-dex" />
       <antcall target="-apk" />
     </target>
 
-    
+
     <target name="clean" description="clean up">
       <delete dir="${staging.dir}"/>
       <delete dir="${bin.dir}"/>
     </target>
 