Fixed build process

app/botejars.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="botejars-imported">
+    <property file="local.properties" />
+    <property name="jar.libs.dir" value="libs" />
 
     <!-- override with i2pbase=path/to/source in local.properties -->
     <property environment="env"/>
@@ -23,21 +25,17 @@
     </fail>
     <echo message="Using I2P-Bote source at ${botebase}" />
 
-    <target name="-pre-compile" depends="copyrouterlibs,copybotelibs" />
+    <target name="precompile" depends="copyrouterlibs,copybotelibs" />
 
-    <!--
+    <target name="preclean">
-         Creates the output directories if they don't exist yet.
+        <delete verbose="${verbose}">
-    -->
+            <fileset dir="${jar.libs.dir}">
-    <target name="-dirs">
+                <exclude name="mail.jar" />
-        <echo>Creating output directories if needed...</echo>
+                <exclude name="additionnal.jar" />
-        <mkdir dir="${resource.absolute.dir}" />
+                <exclude name="activation.jar" />
-        <mkdir dir="${gen.absolute.dir}" />
+                <exclude name="tokenautocomplete.jar" />
-        <mkdir dir="${out.absolute.dir}" />
+            </fileset>
-        <mkdir dir="${out.classes.absolute.dir}" />
+        </delete>
-    </target>
-
-    <target name="-pre-clean">
-        <delete dir="${jar.libs.dir}" verbose="${verbose}" />
         <ant dir="${botebase}" inheritall="false" useNativeBasedir="true" >
             <target name="clean" />
         </ant>
@@ -49,7 +47,7 @@
         <fail unless="i2pbase" message="The I2P environment variable is not set.${line.separator}It must point to an I2P installation. It is usually a path of the form ${line.separator}/xxx/yyy/i2p."/>
     </target>
 
-    <target name="copyrouterlibs" depends="-dirs,checki2pbase" >
+    <target name="copyrouterlibs" depends="checki2pbase" >
         <!-- core -->
         <!-- remove classes that are overridden -->
         <!-- lots of unneeded stuff could be deleted here -->
@@ -76,7 +74,7 @@
         </ant>
     </target>
 
-    <target name="copybotelibs" depends="-dirs,buildbote">
+    <target name="copybotelibs" depends="buildbote">
         <!-- bote -->
         <jar destfile="${jar.libs.dir}/i2pbote.jar" >
             <!-- remove classes that are overridden or stubbed out -->

app/build.gradle

@@ -17,10 +17,11 @@ android {
     }
 }
 
+ant.importBuild('botejars.xml')
+preBuild.dependsOn precompile
+clean.dependsOn preclean
+
 dependencies {
     compile 'com.android.support:appcompat-v7:+'
-    compile files('libs/mail.jar')
+    compile fileTree(dir: 'libs', include: '*.jar')
-    compile files('libs/additionnal.jar')
-    compile files('libs/activation.jar')
-    compile files('libs/tokenautocomplete.jar')
 }