commit c0a5e1e6004229cd53a6c3c271d5d657e93bf7ef
author Adam Lesinski <adamlesinski@google.com> Mon Aug 07 11:56:32 2017 -0700
committer Adam Lesinski <adamlesinski@google.com> Mon Aug 07 11:56:32 2017 -0700
tree 89562c7b1ccbace4c94cc443922d576bfd8d953a
parent b76b3056f57be4abf9fae1375861a5e7c897b074

AAPT2: Make sure to fail when XML linking fails

Bug: 64367402
Test: manual
Change-Id: I3082887f5e449d8d0dac2aad93a834eb346008ba

tools/aapt2/cmd/Link.cpp

diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp
index e6bf3a6..5ad0cdd 100644
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -574,6 +574,11 @@
         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) {