commit d55bef78a5f2a0fe8068b26b463b161bd0398791
author Pierre Lecesne <lecesne@google.com> Fri Nov 10 22:31:01 2017 +0000
committer Pierre Lecesne <lecesne@google.com> Mon Nov 13 21:07:34 2017 +0000
tree 05a154606f720ac82bf85797faee537d0edc4fde
parent a591149cbce49306a6a5e127f077b3551873d490

AAPT2 - Convert command to copy all the files.

Test: Manual

Change-Id: I8705966cb34ff41eb362126a35956720147fae91

tools/aapt2/cmd/Convert.cpp

diff --git a/tools/aapt2/cmd/Convert.cpp b/tools/aapt2/cmd/Convert.cpp
index a34d51b..027ac8f 100644
--- a/tools/aapt2/cmd/Convert.cpp
+++ b/tools/aapt2/cmd/Convert.cpp
@@ -46,17 +46,6 @@
   virtual bool SerializeTable(ResourceTable* table, IArchiveWriter* writer) = 0;
   virtual bool SerializeFile(const FileReference* file, IArchiveWriter* writer) = 0;
 
-  bool CopyFileToArchive(const FileReference* file, IArchiveWriter* writer) {
-    uint32_t compression_flags = file->file->WasCompressed() ? ArchiveEntry::kCompress : 0u;
-    if (!io::CopyFileToArchive(context_, file->file, *file->path, compression_flags, writer)) {
-      context_->GetDiagnostics()->Error(DiagMessage(source_)
-                                        << "failed to copy file " << *file->path);
-      return false;
-    }
-
-    return true;
-  }
-
   virtual ~ISerializer() = default;
 
  protected:
@@ -66,18 +55,21 @@
 
 bool ConvertProtoApkToBinaryApk(IAaptContext* context, unique_ptr<LoadedApk> apk,
                                 ISerializer* serializer, IArchiveWriter* writer) {
+  // AndroidManifest.xml
   if (!serializer->SerializeXml(apk->GetManifest(), kAndroidManifestPath, true /*utf16*/, writer)) {
     context->GetDiagnostics()->Error(DiagMessage(apk->GetSource())
                                      << "failed to serialize AndroidManifest.xml");
     return false;
   }
 
+  // Resource table
   if (!serializer->SerializeTable(apk->GetResourceTable(), writer)) {
     context->GetDiagnostics()->Error(DiagMessage(apk->GetSource())
                                      << "failed to serialize the resource table");
     return false;
   }
 
+  // Resources
   for (const auto& package : apk->GetResourceTable()->packages) {
     for (const auto& type : package->types) {
       for (const auto& entry : type->entries) {
@@ -100,6 +92,31 @@
       } // entry
     } // type
   } // package
+
+  // Other files
+  std::unique_ptr<io::IFileCollectionIterator> iterator = apk->GetFileCollection()->Iterator();
+  while (iterator->HasNext()) {
+    io::IFile* file = iterator->Next();
+
+    std::string path = file->GetSource().path;
+    // The name of the path has the format "<zip-file-name>@<path-to-file>".
+    path = path.substr(path.find('@') + 1);
+
+    // Manifest, resource table and resources have already been taken care of.
+    if (path == kAndroidManifestPath ||
+        path == kApkResourceTablePath ||
+        path == kProtoResourceTablePath ||
+        path.find("res/") == 0) {
+      continue;
+    }
+
+    if (!io::CopyFileToArchivePreserveCompression(context, file, path, writer)) {
+      context->GetDiagnostics()->Error(DiagMessage(apk->GetSource())
+                                       << "failed to copy file " << path);
+      return false;
+    }
+  }
+
   return true;
 }
 
@@ -169,7 +186,11 @@
         return false;
       }
     } else {
-      return CopyFileToArchive(file, writer);
+      if (!io::CopyFileToArchivePreserveCompression(context_, file->file, *file->path, writer)) {
+        context_->GetDiagnostics()->Error(DiagMessage(source_)
+                                          << "failed to copy file " << *file->path);
+        return false;
+      }
     }
 
     return true;