Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 21326 into eclair

Browse Source 
* changes:
  aapt now attempts to process all assets even if some are malformed.
This commit is contained in:
Android (Google) Code Review
2009-08-18 07:20:06 -07:00
parent 8735d553c5 3547f859d4
commit 82e7408be2
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/aapt/Resource.cpp
View File

@@ -272,15 +272,16 @@ static status_t preProcessImages(Bundle* bundle, const sp<AaptAssets>& assets,
ResourceDirIterator it(set, String8("drawable")); ResourceDirIterator it(set, String8("drawable"));
Vector<sp<AaptFile> > newNameFiles; Vector<sp<AaptFile> > newNameFiles;
Vector<String8> newNamePaths; Vector<String8> newNamePaths;
bool hasErrors = false;
ssize_t res; ssize_t res;
while ((res=it.next()) == NO_ERROR) { while ((res=it.next()) == NO_ERROR) {
res = preProcessImage(bundle, assets, it.getFile(), NULL); res = preProcessImage(bundle, assets, it.getFile(), NULL);
if (res != NO_ERROR) { if (res < NO_ERROR) {
return res; hasErrors = true;
} }
} }
return NO_ERROR; return (hasErrors || (res < NO_ERROR)) ? UNKNOWN_ERROR : NO_ERROR;
} }
status_t postProcessImages(const sp<AaptAssets>& assets, status_t postProcessImages(const sp<AaptAssets>& assets,
@@ -288,15 +289,16 @@ status_t postProcessImages(const sp<AaptAssets>& assets,
const sp<ResourceTypeSet>& set) const sp<ResourceTypeSet>& set)
{ {
ResourceDirIterator it(set, String8("drawable")); ResourceDirIterator it(set, String8("drawable"));
bool hasErrors = false;
ssize_t res; ssize_t res;
while ((res=it.next()) == NO_ERROR) { while ((res=it.next()) == NO_ERROR) {
res = postProcessImage(assets, table, it.getFile()); res = postProcessImage(assets, table, it.getFile());
if (res != NO_ERROR) { if (res < NO_ERROR) {
return res; hasErrors = true;
} }
} }
return res < NO_ERROR ? res : (status_t)NO_ERROR; return (hasErrors || (res < NO_ERROR)) ? UNKNOWN_ERROR : NO_ERROR;
} }
static void collect_files(const sp<AaptDir>& dir, static void collect_files(const sp<AaptDir>& dir,