diff options
| -rw-r--r-- | anttasks/src/com/android/ant/AaptExecTask.java | 11 | ||||
| -rw-r--r-- | files/ant/build.xml | 18 |
2 files changed, 27 insertions, 2 deletions
diff --git a/anttasks/src/com/android/ant/AaptExecTask.java b/anttasks/src/com/android/ant/AaptExecTask.java index d0fba5f..2b57277 100644 --- a/anttasks/src/com/android/ant/AaptExecTask.java +++ b/anttasks/src/com/android/ant/AaptExecTask.java @@ -96,6 +96,7 @@ public final class AaptExecTask extends SingleDependencyTask { private String mLibraryResFolderPathRefid; private String mLibraryPackagesRefid; private boolean mNonConstantId; + private String mIgnoreAssets; /** * Input path that ignores the same folders/files that aapt does. @@ -182,6 +183,10 @@ public final class AaptExecTask extends SingleDependencyTask { mNonConstantId = nonConstantId; } + public void setIgnoreAssets(String ignoreAssets) { + mIgnoreAssets = ignoreAssets; + } + public void setVersioncode(String versionCode) { if (versionCode.length() > 0) { try { @@ -621,6 +626,12 @@ public final class AaptExecTask extends SingleDependencyTask { task.createArg().setValue(mRFolder); } + // ignore assets flag + if (mIgnoreAssets != null && mIgnoreAssets.length() > 0) { + task.createArg().setValue("--ignore-assets"); + task.createArg().setValue(mIgnoreAssets); + } + // Use dependency generation task.createArg().setValue("--generate-dependencies"); diff --git a/files/ant/build.xml b/files/ant/build.xml index 0f9bb87..1f85f5e 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -45,6 +45,18 @@ <property name="version.code" value="" /> <property name="version.name" value="" /> <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="" /> <!-- compilation options --> <property name="java.encoding" value="UTF-8" /> @@ -635,7 +647,8 @@ rfolder="${gen.absolute.dir}" nonConstantId="${android.library}" libraryResFolderPathRefid="project.library.res.folder.path" - libraryPackagesRefid="project.library.packages"> + libraryPackagesRefid="project.library.packages" + ignoreAssets="${aapt.ignore.assets}"> <res path="${out.res.absolute.dir}" /> <res path="${resource.absolute.dir}" /> </aapt> @@ -878,7 +891,8 @@ libraryResFolderPathRefid="project.library.res.folder.path" libraryPackagesRefid="project.library.packages" previousBuildType="${build.last.target}" - buildType="${build.target}"> + 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 --> |