1 files changed, 8 insertions, 1 deletions
diff --git a/tools/aapt2/format/Archive.cpp b/tools/aapt2/format/Archive.cpp
index d152a9cc7e62..41f01a01ed7c 100644
--- a/tools/aapt2/format/Archive.cpp
+++ b/tools/aapt2/format/Archive.cpp
@@ -103,7 +103,13 @@ class DirectoryWriter : public IArchiveWriter {
         return false;
       }
     }
-    return !in->HadError();
+
+    if (in->HadError()) {
+      error_ = in->GetError();
+      return false;
+    }
+
+    return FinishEntry();
   }
 
   bool HadError() const override {
@@ -191,6 +197,7 @@ class ZipFileWriter : public IArchiveWriter {
       }
 
       if (in->HadError()) {
+        error_ = in->GetError();
         return false;
       }