From 3299cdafd04b691aa360b1d5e5cb9a17f6240a8c Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Thu, 2 Apr 2015 13:56:56 +0200
Subject: [PATCH] Fix ant build

---
 ant.properties |  2 +-
 build.xml      | 46 ++++++++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/ant.properties b/ant.properties
index 5b87f3d..971f07c 100644
--- a/ant.properties
+++ b/ant.properties
@@ -1 +1 @@
-jar.libs.dir=./libs
+jar.libs.dir=libs
diff --git a/build.xml b/build.xml
index ffd16a4..76e33ea 100644
--- a/build.xml
+++ b/build.xml
@@ -1,24 +1,30 @@
 <project name="nrz-androidlib" default="dist" basedir=".">
-  <property name="dist.dir" location="dist" />
-  <property name="src" location="src"/>
-  <property name="build.dir" location="build"/>
-  
-  <target name="init">
-    <mkdir dir="${build.dir}" />
-    <mkdir dir="${dist.dir}" />
-  </target>
-  
-  <target name="compile" depends="init">
-    <!-- Compile the java code from ${src} into ${build} -->
-    <javac srcdir="${src}" destdir="${build.dir}"/>
-  </target>
+	<property name="dist.dir" location="dist" />
+	<property name="src" location="src"/>
+	<property name="build.dir" location="build"/>
+	<property file="ant.properties" />
 
-  <target name="dist" depends="compile">
-    <jar destfile="${dist.dir}/nrz-androidlib.jar" basedir="${build.dir}" />
-  </target>
+	<path id="res.classpath">
+		<fileset dir="/opt/android-sdk/platforms/android-22/" includes="**/*.jar" />
+	</path>
   
-  <target name="clean">
-    <delete dir="${build.dir}" />
-    <delete dir="${dist.dir}" />
-  </target>
+	<target name="init">
+		<mkdir dir="${build.dir}" />
+		<mkdir dir="${dist.dir}" />
+	</target>
+  
+	<target name="compile" depends="init">
+		<!-- Compile the java code from ${src} into ${build} -->
+		<javac srcdir="${src}" destdir="${build.dir}" classpathref="res.classpath" includeantruntime="false" />
+	</target>
+
+	<target name="dist" depends="compile">
+		<jar destfile="${dist.dir}/nrz-androidlib.jar" basedir="${build.dir}">
+		</jar>
+	</target>
+  
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
 </project>