Revert of Remove apk-codegen.xml

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
 
@@ skipping 33 matching lines @@
   <property name="resource.absolute.dir" location="${resource.dir}"/>
 
   <property name="asset.dir" value="${ASSET_DIR}" />
   <property name="asset.absolute.dir" location="${asset.dir}" />
 
   <property name="aapt" location="${android.sdk.tools.dir}/aapt" />
 
   <property name="version.code" value="${APP_MANIFEST_VERSION_CODE}"/>
   <property name="version.name" value="${APP_MANIFEST_VERSION_NAME}"/>
 
+  <property name="aapt.resource.filter" value="" />
+  <!-- 'aapt.ignore.assets' is the list of file patterns to ignore under /res and /assets.
+         Default is "!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
+
+         Overall patterns syntax is:
+           [!][<dir>|<file>][*suffix-match|prefix-match*|full-match]:more:patterns...
+
+         - The first character flag ! avoids printing a warning.
+         - Pattern can have the flag "<dir>" to match only directories
+           or "<file>" to match only files. Default is to match both.
+         - Match is not case-sensitive.
+  -->
+  <property name="aapt.ignore.assets" value="" />
+
   <!--
       Include additional resource folders in the apk, e.g. content/.../res.  We
       list the res folders in project.library.res.folder.path and the
       corresponding java packages in project.library.packages, which must be
       semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, hence
       the replacestring filterchain task.
   -->
   <path id="project.library.res.folder.path">
     <filelist files="${ADDITIONAL_RES_DIRS}"/>
   </path>
@@ skipping 11 matching lines @@
   <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="-package-resources">
+  <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="${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=""
+        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="">
+        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>