am 36ac43ba: Merge "Tweak default ignore-assets path"

* commit '36ac43ba9982a78b4a047c8970776505a3fab4da':
  Tweak default ignore-assets path

diff --combined AaptAssets.cpp
index eba77c258acbf41367bb77dc8cadd674f3308027,22f495ae7a38eb3ac9256209b5412c7b586d112f..012f84eb797fe0b3c8bd07330f06fc58c847d8e8
--- 1/AaptAssets.cpp
--- 2/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@@ -58,7 -58,7 +58,7 @@@ static bool validateFileName(const char
  
  // 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;
  
@@@ -122,6 -122,7 +122,6 @@@ static bool isHidden(const char *root, 
          if (token[0] == '*') {
              // Match *suffix
              token++;
 -            n--;
              if (n <= plen) {
                  ignore = strncasecmp(token, path + plen - n, n) == 0;
              }