diff options
| author | Ying Wang <wangying@google.com> | 2012-05-22 11:24:22 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2012-05-24 11:07:14 -0700 |
| commit | 98a0607a314a7a6023fabdafaa8e470a1e800c09 (patch) | |
| tree | 820f623b5b8b83061597cc24996cab7615f54e34 /tools/aapt/AaptAssets.cpp | |
| parent | d4cb08df751e29338f4df1a76b303aa720f2bc00 (diff) | |
| download | frameworks_base-98a0607a314a7a6023fabdafaa8e470a1e800c09.zip frameworks_base-98a0607a314a7a6023fabdafaa8e470a1e800c09.tar.gz frameworks_base-98a0607a314a7a6023fabdafaa8e470a1e800c09.tar.bz2 | |
Merge "Fix length of pattern." DO NOT MERGE.
After skipping * with "token++", the length should decrease by 1 as
well.
(merged from 996b073e813ba1a22a13282ccdebb664f14ba898)
Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index eba77c2..7d735ad 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -122,6 +122,7 @@ 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; } |