diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-06-05 07:42:43 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-05 07:42:43 -0700 |
| commit | 36ac43ba9982a78b4a047c8970776505a3fab4da (patch) | |
| tree | cc5f1052ffefb73dcd46da1683d6bcfe6eda5adf /tools | |
| parent | 0748a5698776d1a9693a5449ffc983af26cc533b (diff) | |
| parent | e0219c8baa9d63b3794f90ab772f1c19ecb74ec4 (diff) | |
| download | frameworks_base-36ac43ba9982a78b4a047c8970776505a3fab4da.zip frameworks_base-36ac43ba9982a78b4a047c8970776505a3fab4da.tar.gz frameworks_base-36ac43ba9982a78b4a047c8970776505a3fab4da.tar.bz2 | |
Merge "Tweak default ignore-assets path"
Diffstat (limited to 'tools')
| -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 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; |