Index: build/android/ant/apk-package-resources.xml |
diff --git a/build/android/ant/apk-package-resources.xml b/build/android/ant/apk-package-resources.xml |
index 147ebc4cbf35f2eec1ee64be03d2828ce9fc3ed5..b2e16069f7755450d24a6fddcf7e00c6149aec10 100644 |
--- a/build/android/ant/apk-package-resources.xml |
+++ b/build/android/ant/apk-package-resources.xml |
@@ -51,20 +51,6 @@ |
<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 |
@@ -96,19 +82,7 @@ |
<!-- 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"> |
+ <target name="-package-resources"> |
<aapt |
executable="${aapt}" |
command="package" |
@@ -121,13 +95,13 @@ |
apkfolder="${out.absolute.dir}" |
nocrunch="${build.packaging.nocrunch}" |
resourcefilename="${resource.package.file.name}" |
- resourcefilter="${aapt.resource.filter}" |
+ resourcefilter="" |
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}"> |
+ ignoreAssets=""> |
<res path="${out.res.absolute.dir}" /> |
<res path="${resource.absolute.dir}" /> |
<!-- <nocompress /> forces no compression on any files in assets or res/raw --> |