Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b148ac22 authored by Abhishek Nigam's avatar Abhishek Nigam
Browse files

Revert "Fix non-AB ota generation failure" 

This reverts commit 782b7528.

bug: 308932171
tested: locally generated and applied ota on nonab device
Change-Id: I67b26be01d6240b2cb332e13bc7c7959de128755
parent 7705138a

tools/releasetools/edify_generator.py

+3 −12
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ import re 


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
@@ -277,7 +268,7 @@ class EdifyGenerator(object): 
      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, PARTITION_TYPES[p.fs_type],

          p.fs_type, common.PARTITION_TYPES[p.fs_type],

          self._GetSlotSuffixDeviceForEntry(p),

          p.mount_point, mount_flags))

      self.mounts.add(p.mount_point)
@@ -313,7 +304,7 @@ class EdifyGenerator(object): 
    if fstab:

      p = fstab[partition]

      self.script.append('format("%s", "%s", %s, "%s", "%s");' %

                         (p.fs_type, PARTITION_TYPES[p.fs_type],

                         (p.fs_type, common.PARTITION_TYPES[p.fs_type],

                          self._GetSlotSuffixDeviceForEntry(p),

                          p.length, p.mount_point))
@@ -427,7 +418,7 @@ class EdifyGenerator(object): 
    fstab = self.fstab

    if fstab:

      p = fstab[mount_point]

      partition_type = PARTITION_TYPES[p.fs_type]

      partition_type = common.PARTITION_TYPES[p.fs_type]

      device = self._GetSlotSuffixDeviceForEntry(p)

      args = {'device': device, 'fn': fn}

      if partition_type == "EMMC":

tools/releasetools/non_ab_ota.py

+16 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import shlex 


import common

import edify_generator

from edify_generator import ErrorCode, PARTITION_TYPES

from edify_generator import ErrorCode

from check_target_files_vintf import CheckVintfIfTrebleEnabled, HasPartition

from common import OPTIONS, Run, MakeTempDir, RunAndCheckOutput, ZipWrite, MakeTempFile

from ota_utils import UNZIP_PATTERN, FinalizeMetadata, GetPackageMetadata, PropertyFiles
@@ -1544,6 +1544,16 @@ class DynamicPartitionsDifference(object): 
        append('move %s %s' % (p, u.tgt_group))





# map recovery.fstab's fs_types to mount/format "partition types"

PARTITION_TYPES = {

    "ext4": "EMMC",

    "emmc": "EMMC",

    "f2fs": "EMMC",

    "squashfs": "EMMC",

    "erofs": "EMMC"

}





def GetTypeAndDevice(mount_point, info, check_no_slot=True):

  """

  Use GetTypeAndDeviceExpr whenever possible. This function is kept for