From 988cdf98eba03c513b00e864a5d0480614e0a2d5 Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Thu, 9 Jun 2016 12:53:47 -0500
Subject: [PATCH] Update build.xml for new format from updated toolchains

---
 support/android/apk/build.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/support/android/apk/build.xml b/support/android/apk/build.xml
index 3e22c93f50a..3d1611517a8 100644
--- a/support/android/apk/build.xml
+++ b/support/android/apk/build.xml
@@ -36,9 +36,17 @@
     <condition property="sdk.dir" value="${env.ANDROID_HOME}">
         <isset property="env.ANDROID_HOME" />
     </condition>
-    <condition property="target" value="${env.ANDROID_PLATFORM}">
-        <isset property="env.ANDROID_PLATFORM" />
-    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
 
     <!-- quick check on sdk.dir -->
     <fail