android: Fix build more after 255971.

build/android/ant/apk-obfuscate.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2005-2008 The Android Open Source Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
          http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
 
 <project default="-obfuscate">
   <property name="verbose" value="false" />
   <property name="out.dir" location="${OUT_DIR}" />
   <!-- Output directories -->
   <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}"/>
   <property name="android.tools.dir" location="${sdk.dir}/tools" />
 
   <property name="project.target.android.jar" location="${ANDROID_SDK_JAR}" />
   <path id="project.target.class.path">
     <pathelement location="${project.target.android.jar}" />
   </path>
 
@@ skipping 11 matching lines @@
     <filelist files="${INPUT_JARS_PATHS}"/>
   </path>
 
   <condition property="project.is.testapp" value="true" else="false">
     <equals arg1="${IS_TEST_APK}" arg2="1" />
   </condition>
 
   <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.
 
   -->
   <!--
     Override obfuscate target to pass javac.custom.classpath to Proguard. SDK tools do not provide
     any way to pass custom class paths to Proguard.
    -->
   <target name="-obfuscate">
     <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"/>
           <filterchain>
             <replacestring from="." to="/"/>
           </filterchain>
         </loadresource>
         <property name="create.test.jar.exclusions" value="${project.app.packagepath}/R.class ${project.app.packagepath}/R$*.class ${project.app.packagepath}/Manifest.class ${project.app.packagepath}/Manifest$*.class ${project.app.packagepath}/BuildConfig.class"/>
         <jar destfile="${TEST_JAR_PATH}"
              excludes="${create.test.jar.exclusions}"
@@ skipping 84 matching lines @@
           -dump         "${obfuscate.absolute.dir}/dump.txt"
           -printseeds   "${obfuscate.absolute.dir}/seeds.txt"
           -printusage   "${obfuscate.absolute.dir}/usage.txt"
           -printmapping "${obfuscate.absolute.dir}/mapping.txt"
         </proguard>
       </then>
     </if>
     <touch file="${STAMP}" />
   </target>
 </project>