android: Fix build more after 255971.

build/android/ant/apk-obfuscate.xml

Index: build/android/ant/apk-obfuscate.xml
diff --git a/build/android/ant/apk-obfuscate.xml b/build/android/ant/apk-obfuscate.xml
index 4e737dae59ed936ac9b200456bd10288da7b6b55..0b470086c57c79f84c847cdb36602d2b2d16faeb 100644
--- a/build/android/ant/apk-obfuscate.xml
+++ b/build/android/ant/apk-obfuscate.xml
@@ -22,7 +22,6 @@
   <property name="out.dir" value="bin" />

[cjhopman, 2014/03/10 21:34:41]

This is awkward. This line doesn't do anything (and would be wrong if it did).

   <property name="out.absolute.dir" location="${out.dir}" />

[cjhopman, 2014/03/10 21:34:41]

I'm pretty sure out.dir is actually already absolute because it uses location
instead of value above

[Nico, 2014/03/10 21:38:25]

Yes, all the xml files have several abs.foo and foo properties that look
somewhat redundant. Should probably be cleaned up at some point.

   <property name="out.classes.absolute.dir" location="${out.dir}/classes" />
-  <property name="out.manifest.abs.file" location="${out.dir}/AndroidManifest.xml" />
 
   <!-- tools location -->
   <property name="sdk.dir" location="${ANDROID_SDK_ROOT}"/>
@@ -54,6 +53,9 @@
   <property name="proguard.enabled" value="${PROGUARD_ENABLED}" />
   <property name="proguard.config" value="${PROGUARD_FLAGS}" />
 
+  <property name="manifest.file" value="${ANDROID_MANIFEST}" />
+  <property name="manifest.abs.file" location="${manifest.file}" />
+
   <!-- Obfuscate target
       This is only active in release builds when proguard.config is defined
       in default.properties.
@@ -67,7 +69,7 @@
     <if condition="${project.is.testapp}">
       <then>
         <!-- get the project manifest package -->
-        <xpath input="${out.manifest.abs.file}"
+        <xpath input="${manifest.abs.file}"
                 expression="/manifest/@package" output="project.app.package" />
         <loadresource property="project.app.packagepath">
           <propertyresource name="project.app.package"/>