diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-06-05 08:41:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-05 08:41:16 -0700 |
| commit | 44ff9b8f9294e015031fc9293974604771e5efdd (patch) | |
| tree | 91eabfeb2a567799b801af23f5e59b23d735488c /tools/aapt | |
| parent | 3df4e1a2f1b4f0eb110c8983107b7c7fa21ed338 (diff) | |
| parent | 36ac43ba9982a78b4a047c8970776505a3fab4da (diff) | |
| download | frameworks_base-44ff9b8f9294e015031fc9293974604771e5efdd.zip frameworks_base-44ff9b8f9294e015031fc9293974604771e5efdd.tar.gz frameworks_base-44ff9b8f9294e015031fc9293974604771e5efdd.tar.bz2 | |
am 36ac43ba: Merge "Tweak default ignore-assets path"
* commit '36ac43ba9982a78b4a047c8970776505a3fab4da':
Tweak default ignore-assets path
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index eba77c2..012f84e 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -58,7 +58,7 @@ static bool validateFileName(const char* fileName) // The default to use if no other ignore pattern is defined. const char * const gDefaultIgnoreAssets = - "!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"; + "!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"; // The ignore pattern that can be passed via --ignore-assets in Main.cpp const char * gUserIgnoreAssets = NULL; |