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

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

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

9
tools/aapt/Resource.cpp
View File

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