summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2012-06-04 10:38:13 -0700
committerTor Norbye <tnorbye@google.com>2012-06-04 10:41:38 -0700
commite0219c8baa9d63b3794f90ab772f1c19ecb74ec4 (patch)
treecc5f1052ffefb73dcd46da1683d6bcfe6eda5adf /tools/aapt
parent0748a5698776d1a9693a5449ffc983af26cc533b (diff)
downloadframeworks_base-e0219c8baa9d63b3794f90ab772f1c19ecb74ec4.zip
frameworks_base-e0219c8baa9d63b3794f90ab772f1c19ecb74ec4.tar.gz
frameworks_base-e0219c8baa9d63b3794f90ab772f1c19ecb74ec4.tar.bz2
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 <x>)" 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
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/AaptAssets.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 7d735ad..22f495a 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;