]> git.saurik.com Git - android/aapt.git/commitdiff
am 36ac43ba: Merge "Tweak default ignore-assets path"
authorTor Norbye <tnorbye@google.com>
Tue, 5 Jun 2012 15:41:16 +0000 (08:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Jun 2012 15:41:16 +0000 (08:41 -0700)
* commit '36ac43ba9982a78b4a047c8970776505a3fab4da':
  Tweak default ignore-assets path

AaptAssets.cpp

index 22f495ae7a38eb3ac9256209b5412c7b586d112f..012f84eb797fe0b3c8bd07330f06fc58c847d8e8 100644 (file)
@@ -122,7 +122,6 @@ static bool isHidden(const char *root, const char *path)
         if (token[0] == '*') {
             // Match *suffix
             token++;
-            n--;
             if (n <= plen) {
                 ignore = strncasecmp(token, path + plen - n, n) == 0;
             }