commit 1e22b33f34d7cd72fa11388e65a1cca8a1d41452
author Adam Lesinski <adamlesinski@google.com> Tue Sep 05 18:53:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 05 18:53:44 2017 +0000
tree e8683357fdd89b74da44713265d84e2014a852f5
parent 88aa3d0f3e2d53ef99ac7caed838ab02c0d85d80
parent de7b74233513b3b962737d95bf1a73be4282452c

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

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) {