From e0219c8baa9d63b3794f90ab772f1c19ecb74ec4 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Mon, 4 Jun 2012 10:38:13 -0700 Subject: Tweak default ignore-assets path Add .DS_Store to the list of ignored files that are silently ignored (other dot-files are ignored but aapt emits a "(skipping )" message.) Also, add a "!" prefix to the *~ pattern for Emacs/Vim/Gedit backup files. Finally, move the !*.scc pattern up in front of the .* pattern, such that it doesn't match the earlier .* pattern (which is verbose, unlike !*.scc). Change-Id: Id3e96490f1802486aea8c58366d43e9d413971b8 --- tools/aapt/AaptAssets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/aapt/AaptAssets.cpp') diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 7d735ad424e6..22f495ae7a38 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:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"; + "!.svn:!.git:!.ds_store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~"; // The ignore pattern that can be passed via --ignore-assets in Main.cpp const char * gUserIgnoreAssets = NULL; -- cgit v1.2.3-59-g8ed1b