commit 782b7528892ee7971ed6c51827d5227de79438ce
author Kelvin Zhang <zhangkelvin@google.com> Tue Oct 31 19:33:55 2023 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Tue Oct 31 19:42:39 2023 -0700
tree 6a17e9abd02af4e713375532d8752ae36c784387
parent d22a5558f42f166d2cee9c21fa66fc188a5d5190

Fix non-AB ota generation failure

Test: ota generation on pinot target
Bug: 308615740
Change-Id: I8b540516c0ba9e3acb23eebad8569a6dbf2ef9f3

tools/releasetools/edify_generator.py

diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index 664d5cd..0a7653c 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -16,6 +16,15 @@
 
 import common
 
+# map recovery.fstab's fs_types to mount/format "partition types"
+PARTITION_TYPES = {
+    "ext4": "EMMC",
+    "emmc": "EMMC",
+    "f2fs": "EMMC",
+    "squashfs": "EMMC",
+    "erofs": "EMMC"
+}
+
 
 class ErrorCode(object):
   """Define error_codes for failures that happen during the actual
@@ -268,7 +277,7 @@
       if p.context is not None:
         mount_flags = p.context + ("," + mount_flags if mount_flags else "")
       self.script.append('mount("%s", "%s", %s, "%s", "%s");' % (
-          p.fs_type, common.PARTITION_TYPES[p.fs_type],
+          p.fs_type, PARTITION_TYPES[p.fs_type],
           self._GetSlotSuffixDeviceForEntry(p),
           p.mount_point, mount_flags))
       self.mounts.add(p.mount_point)
@@ -304,7 +313,7 @@
     if fstab:
       p = fstab[partition]
       self.script.append('format("%s", "%s", %s, "%s", "%s");' %
-                         (p.fs_type, common.PARTITION_TYPES[p.fs_type],
+                         (p.fs_type, PARTITION_TYPES[p.fs_type],
                           self._GetSlotSuffixDeviceForEntry(p),
                           p.length, p.mount_point))
 
@@ -418,7 +427,7 @@
     fstab = self.fstab
     if fstab:
       p = fstab[mount_point]
-      partition_type = common.PARTITION_TYPES[p.fs_type]
+      partition_type = PARTITION_TYPES[p.fs_type]
       device = self._GetSlotSuffixDeviceForEntry(p)
       args = {'device': device, 'fn': fn}
       if partition_type == "EMMC":