From 5b6bb5abcaaf517730e546dd41d084af38b144cf Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Thu, 22 Dec 2016 08:59:06 -0500 Subject: [PATCH] Ignore character checks on filenames --- tools/aapt/Resource.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index f6e0064dc2a44..7618528337e0a 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -315,9 +315,9 @@ static status_t makeFileResources(Bundle* bundle, const sp& assets, || (*str >= 'A' && *str <= 'Z') || (*str >= '0' && *str <= '9') || *str == '_' || *str == '.')) { - fprintf(stderr, "%s: Invalid file name: must contain only [a-zA-Z0-9_.]\n", + fprintf(stderr, "%s: Invalid file name: must contain only [a-zA-Z0-9_.]. Ignoring...\n", it.getPath().string()); - hasErrors = true; + //hasErrors = true; } str++; } @@ -546,10 +546,10 @@ static int validateAttr(const String8& path, const ResTable& table, p++; } if (!okay) { - fprintf(stderr, "%s:%d: Tag <%s> attribute %s has invalid character '%c'.\n", + fprintf(stderr, "%s:%d: Tag <%s> attribute %s has invalid character '%c'. Ignoring...\n", path.string(), parser.getLineNumber(), String8(parser.getElementName(&len)).string(), attr, (char)str[i]); - return (int)i; + return ATTR_OKAY; } } }