Merge "Tweak default ignore-assets path"

2012-06-05 07:42:43 -07:00
parent 0748a56987 e0219c8baa
commit 36ac43ba99
1 changed files with 1 additions and 1 deletions
--- 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;