Permalink
Browse files

Ignore character checks on filenames

1 parent 57913a4 commit 8ae80ab8e27942b65fd7c8dc9401dc58860bda3c @iBotPeaches committed Dec 22, 2016
Showing with 4 additions and 4 deletions.
  1. +4 −4 tools/aapt/Resource.cpp
@@ -319,9 +319,9 @@ static status_t makeFileResources(Bundle* bundle, const sp<AaptAssets>& 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++;
}
@@ -550,10 +550,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;
}
}
}

0 comments on commit 8ae80ab

Please sign in to comment.