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

Commit 84be36e7 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "AAPT2: Make sure to fail when XML linking fails" into oc-mr1-dev 

am: 1e22b33f

Change-Id: Ic32bb2076e65d66fbba2c59f29f31d132b12fa0a
parents bfe2580b 1e22b33f

tools/aapt2/cmd/Link.cpp

+5 −0
Original line number Diff line number Diff line
@@ -574,6 +574,11 @@ bool ResourceFileFlattener::Flatten(ResourceTable* table, IArchiveWriter* archiv 
        if (file_op.xml_to_flatten) {

          std::vector<std::unique_ptr<xml::XmlResource>> versioned_docs =

              LinkAndVersionXmlFile(table, &file_op);

          if (versioned_docs.empty()) {

            error = true;

            continue;

          }



          for (std::unique_ptr<xml::XmlResource>& doc : versioned_docs) {

            std::string dst_path = file_op.dst_path;

            if (doc->file.config != file_op.config) {