diff options
| author | 2012-06-05 08:45:20 -0700 | |
|---|---|---|
| committer | 2012-06-05 08:45:20 -0700 | |
| commit | 9f374b9de5a557a7977b24d41f45c3464cfff8c1 (patch) | |
| tree | 7d2eba9b27fcddaf67d48fa22e1bebc2ff0b6dca /tools/aapt/AaptAssets.cpp | |
| parent | b25605cd7111bcab41ec10547f015bd2d6215c91 (diff) | |
| parent | 44ff9b8f9294e015031fc9293974604771e5efdd (diff) | |
am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"
* commit '44ff9b8f9294e015031fc9293974604771e5efdd':
Tweak default ignore-assets path
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
| -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 f2fa3f57e245..46b8a274b1af 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; |