From 3edc0006b5d3af87851d73f00e48a44fc040668e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 18 Jun 2015 11:54:29 +0200
Subject: [PATCH] Fix compilation with latest android sdk tools

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

diff --git a/build.xml b/build.xml
index 4588f2c03..c23990f28 100644
--- a/build.xml
+++ b/build.xml
@@ -88,7 +88,22 @@
          In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
          in order to avoid having your file be overridden by tools such as "android update project"
     -->
-    <!-- version-tag: custom -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
+	<path id="android.antlibs">
+		<pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />
+	</path>
+
+	<!-- Custom tasks -->
+	<taskdef resource="anttasks.properties" classpathref="android.antlibs" />
+	<property name="exe" value="" />
+	<property name="bat" value="" />
+	
+	<getbuildtools name="android.build.tools.dir" verbose="${verbose}" />
+	<property name="aidl" location="${android.build.tools.dir}/aidl${exe}" />
+	<property name="aapt" location="${android.build.tools.dir}/aapt${exe}" />
+	<property name="dx" location="${android.build.tools.dir}/dx${bat}" />
+	<property name="zipalign" location="${android.build.tools.dir}/zipalign${exe}" />
+
+	<!-- version-tag: custom -->
+	<import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>