android: Fix build more after 255971.

build/android/ant/apk-package-resources.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="-package-resources">
   <property name="out.dir" location="${OUT_DIR}" />
   <property name="out.absolute.dir" location="${out.dir}" />
   <property name="out.res.absolute.dir" location="${out.dir}/res" />
-  <property name="out.manifest.abs.file" location="${out.dir}/AndroidManifest.xml" />
 
   <!-- tools location -->
   <property name="sdk.dir" location="${ANDROID_SDK_ROOT}"/>
   <property name="project.target.android.jar" location="${ANDROID_SDK_JAR}" />
   <property name="android.sdk.tools.dir" location="${ANDROID_SDK_TOOLS}" />
 
   <!-- jar file from where the tasks are loaded -->
   <path id="android.antlibs">
     <pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />
   </path>
@@ skipping 51 matching lines @@
     <propertyresource name="ADDITIONAL_RES_PACKAGES"/>
     <filterchain>
       <replacestring from=" " to=";"/>
     </filterchain>
   </loadresource>
   <!-- Set to empty if not set by the loadresource above -->
   <property name="project.library.packages" value=""/>
 
   <property name="build.packaging.nocrunch" value="true" />
 
+  <property name="manifest.file" value="${ANDROID_MANIFEST}" />
+  <property name="manifest.abs.file" location="${manifest.file}" />
+
   <!-- Intermediate files -->
   <property name="resource.package.file.name" value="${APK_NAME}.ap_" />
 
   <target name="-crunch">
     <!-- Updates the pre-processed PNG cache -->
     <exec executable="${aapt}" taskName="crunch">
       <arg value="crunch" />
       <arg value="-v" />
       <arg value="-S" />
       <arg path="${resource.absolute.dir}" />
       <arg value="-C" />
       <arg path="${out.res.absolute.dir}" />
     </exec>
   </target>
 
   <target name="-package-resources" depends="-crunch">
     <aapt
         executable="${aapt}"
         command="package"
         versioncode="${version.code}"
         versionname="${version.name}"
         debug="${build.is.packaging.debug}"
-        manifest="${out.manifest.abs.file}"
+        manifest="${manifest.abs.file}"
         assets="${asset.absolute.dir}"
         androidjar="${project.target.android.jar}"
         apkfolder="${out.absolute.dir}"
         nocrunch="${build.packaging.nocrunch}"
         resourcefilename="${resource.package.file.name}"
         resourcefilter="${aapt.resource.filter}"
         libraryResFolderPathRefid="project.library.res.folder.path"
         libraryPackagesRefid="project.library.packages"
         libraryRFileRefid="project.library.bin.r.file.path"
         previousBuildType=""
         buildType="${build.target}"
         ignoreAssets="${aapt.ignore.assets}">
       <res path="${out.res.absolute.dir}" />
       <res path="${resource.absolute.dir}" />
       <!-- <nocompress /> forces no compression on any files in assets or res/raw -->
       <!-- <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw -->
     </aapt>
 
     <touch file="${STAMP}" />
   </target>
 </project>