Updated Android project files

project/build.xml

@@ -4,7 +4,7 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->
-    <loadproperties srcFile="local.properties" />
+    <property file="local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
          'android' tool to add properties to it.
@@ -28,6 +28,15 @@
          -->
     <property file="ant.properties" />
 
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
     <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
 
@@ -41,25 +50,23 @@
 
     <!-- quick check on sdk.dir -->
     <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
             unless="sdk.dir"
     />
 
-
+    <!--
-<!-- extension targets. Uncomment the ones where you want to do custom work
+        Import per project custom build rules if present at the root of the project.
-     in between standard targets -->
+        This is the place to put custom intermediary targets such as:
-<!--
+            -pre-build
-    <target name="-pre-build">
+            -pre-compile
-    </target>
+            -post-compile (This is typically used for code obfuscation.
-    <target name="-pre-compile">
+                           Compiled code location: ${out.classes.absolute.dir}
-    </target>
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
-
+            -post-package
-    /* This is typically used for code obfuscation.
+            -post-build
-       Compiled code location: ${out.classes.absolute.dir}
+            -pre-clean
-       If this is not done in place, override ${out.dex.input.absolute.dir} */
+    -->
-    <target name="-post-compile">
+    <import file="custom_rules.xml" optional="true" />
-    </target>
--->
 
     <!-- Import the actual build file.