commit 8c719ce91624e508f3b2865f985a59be4bede3f7
author Kelvin Zhang <zhangkelvin@google.com> Tue Jun 13 01:02:42 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 13 01:02:42 2023 +0000
tree 923b5ce24cacfbf55a967d95d8b907b385645edb
parent bc9acdf3c07876f625558a2377b8f6a39340e002
parent df9821b89390c9c1d028a15e4abc27d9f71aae74

Support squashfs in map_file_generator am: df9821b893

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2620039

Change-Id: Id7179416fb5deaa6a8f7157e35be4649e712b32c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index a466f93..efcd4db 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1338,4 +1338,7 @@
         "libsparse",
         "update_metadata-protos",
     ],
+    required: [
+        "unsquashfs",
+    ],
 }

aosp/map_file_generator.cc

diff --git a/aosp/map_file_generator.cc b/aosp/map_file_generator.cc
index c4c9b51..8e20720 100644
--- a/aosp/map_file_generator.cc
+++ b/aosp/map_file_generator.cc
@@ -23,9 +23,12 @@
 
 #include "android-base/file.h"
 #include "common/utils.h"
-#include "update_engine/payload_generator/ext2_filesystem.h"
+#include "update_engine/payload_generator/delta_diff_generator.h"
 #include "update_engine/payload_generator/erofs_filesystem.h"
+#include "update_engine/payload_generator/ext2_filesystem.h"
 #include "update_engine/payload_generator/filesystem_interface.h"
+#include "update_engine/payload_generator/raw_filesystem.h"
+#include "update_engine/payload_generator/squashfs_filesystem.h"
 
 namespace chromeos_update_engine {
 
@@ -104,8 +107,14 @@
       return -1;
     }
     img = tmpfile.path;
+    fd.reset(open(img, O_RDONLY | O_CLOEXEC));
   }
   std::unique_ptr<FilesystemInterface> fs;
+
+  fs = SquashfsFilesystem::CreateFromFile(img, true);
+  if (fs != nullptr) {
+    return WriteBlockMap(img, fs.get(), output_file);
+  }
   fs = ErofsFilesystem::CreateFromFile(img);
   if (fs != nullptr) {
     return WriteBlockMap(img, fs.get(), output_file);