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

am f2d2c871: AAPT should not process XML that failed to compile

Browse Source 
* commit 'f2d2c871813656012420faa89080d8e3cda1f308':
  AAPT should not process XML that failed to compile
This commit is contained in:
Adam Lesinski
2014-05-05 21:09:49 +00:00
committed by Android Git Automerger
parent e88097bd00 f2d2c87181
commit 34dd2cdd41
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/aapt/Resource.cpp
View File

@@ -1236,12 +1236,13 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
while ((err=it.next()) == NO_ERROR) { while ((err=it.next()) == NO_ERROR) {
String8 src = it.getFile()->getPrintableSource(); String8 src = it.getFile()->getPrintableSource();
err = compileXmlFile(assets, it.getFile(), &table, xmlFlags); err = compileXmlFile(assets, it.getFile(), &table, xmlFlags);
if (err != NO_ERROR) { if (err == NO_ERROR) {
hasErrors = true;
}
ResXMLTree block; ResXMLTree block;
block.setTo(it.getFile()->getData(), it.getFile()->getSize(), true); block.setTo(it.getFile()->getData(), it.getFile()->getSize(), true);
checkForIds(src, block); checkForIds(src, block);
} else {
hasErrors = true;
}
} }
if (err < NO_ERROR) { if (err < NO_ERROR) {