Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0472fb58 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

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

* commit '34dd2cdd':
  AAPT should not process XML that failed to compile
parents 9bb4df3a 34dd2cdd

tools/aapt/Resource.cpp

+5 −4
Original line number Diff line number Diff line
@@ -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) {

                hasErrors = true;

            }

            if (err == NO_ERROR) {

                ResXMLTree block;

                block.setTo(it.getFile()->getData(), it.getFile()->getSize(), true);

                checkForIds(src, block);

            } else {

                hasErrors = true;

            }

        }



        if (err < NO_ERROR) {