From f0d4b2065a10a9bbe588841943389de8a6cd651c Mon Sep 17 00:00:00 2001
From: Riccardo Di Meo <riccardo.dimeo42@gmail.com>
Date: Fri, 6 May 2016 15:18:55 +0200
Subject: [PATCH 1/2] Added missing dependencies in build.xml

---
 build.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 8aa18a1084..533e861be0 100644
--- a/build.xml
+++ b/build.xml
@@ -6,6 +6,10 @@
   </description>
 
   <property name="src" location="src"/>
+  <property name="platform" location="android/platform"/>
+  <property name="libcore-src" location="${platform}/libcore/dex/src/main/java"/>
+  <property name="dalvik-dexgen-src" location="${platform}/dalvik/dexgen/src"/>
+  <property name="dalvik-dx-src" location="${platform}/dalvik/dx/src"/>
   <property name="test" location="test"/>
   <property name="jsrc" location="${src}/jvm"/>
   <property name="jtestsrc" location="${test}/java"/>
@@ -34,12 +38,18 @@
     <mkdir dir="${build}/clojure"/>
     <echo file="${version.properties}">version=${clojure.version.label}</echo>
   </target>
-
+  
   <target name="compile-java" depends="init"
           description="Compile Java sources.">
     <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
            includeAntRuntime="false"
-           debug="true" source="1.6" target="1.6"/>
+	classpath="${maven.compile.classpath}:${build}"
+           debug="true" source="1.6" target="1.6">
+      <src path="${libcore-src}"/>
+      <src path="${dalvik-dexgen-src}"/> 
+      <src path="${dalvik-dx-src}"/> 
+      <src path="${jsrc}"/>
+    </javac>
   </target>
 
   <target name="compile-clojure"

From 8e8941ce63e432d2ba98e03169bfce372d1bc3eb Mon Sep 17 00:00:00 2001
From: Riccardo Di Meo <riccardo.dimeo42@gmail.com>
Date: Fri, 6 May 2016 15:48:12 +0200
Subject: [PATCH 2/2] Set the jar output directory for ant to "target"

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 533e861be0..268abd920f 100644
--- a/build.xml
+++ b/build.xml
@@ -29,8 +29,8 @@
   <property name="clojure.version.label" value="${pom.project.version}"/>
   <property name="version.properties" value="${build}/clojure/version.properties"/>
 
-  <property name="clojure_jar" location="clojure-${clojure.version.label}.jar"/>
-  <property name="clojure_noversion_jar" location="clojure.jar"/>
+  <property name="clojure_jar" location="${target}/clojure-${clojure.version.label}.jar"/>
+  <property name="clojure_noversion_jar" location="${target}/clojure.jar"/>
 
   <target name="init" depends="clean">
     <tstamp/>