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

am: 1e22b33f34 Change-Id: Ic32bb2076e65d66fbba2c59f29f31d132b12fa0a
2017-09-05 18:59:39 +00:00
parent bfe2580b24 1e22b33f34
commit 84be36e7b5
1 changed files with 5 additions and 0 deletions
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -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) {