diff options
| author | Raphael Moll <ralf@android.com> | 2012-05-11 11:37:39 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2012-05-17 22:03:23 -0700 |
| commit | 6a98de15b34aad728c6a28fa8da0d9fe4e9fe4f5 (patch) | |
| tree | cf7f0d17cf4f4aea3453323c22b55ddff5b45ac7 /files | |
| parent | 1e7051a6d0afff8eba85782d902dbd9392cf3744 (diff) | |
| download | sdk-6a98de15b34aad728c6a28fa8da0d9fe4e9fe4f5.zip sdk-6a98de15b34aad728c6a28fa8da0d9fe4e9fe4f5.tar.gz sdk-6a98de15b34aad728c6a28fa8da0d9fe4e9fe4f5.tar.bz2 | |
SDK/ant: pass --ignore-assets flag to AAPT.
Requires change Ia4caa2a8 from frameworks/base.git
Change-Id: Ifcb469a64146ac2ae65f8516ee9dcfb857a7e2aa
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 18 |
1 files changed, 16 insertions, 2 deletions
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 --> |