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

Commit f7b7e69d authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "releasetools: compare size between compressed and patch while build... 

Merge "releasetools: compare size between compressed and patch while build otapackage" am: 49758959 am: 9242e1f7 am: aa4d046b
am: c9b8d96c

Change-Id: I0a143e1a7dabc732e9e18d2a7af9eb864eb7fc79
parents a45d083b c9b8d96c

tools/releasetools/common.py

+2 −1
Original line number Diff line number Diff line
@@ -1211,10 +1211,11 @@ class DeviceSpecificParams(object): 
    return self._DoCall("VerifyOTA_Assertions")



class File(object):

  def __init__(self, name, data):

  def __init__(self, name, data, compress_size = None):

    self.name = name

    self.data = data

    self.size = len(data)

    self.compress_size = compress_size or self.size

    self.sha1 = sha1(data).hexdigest()



  @classmethod

tools/releasetools/ota_from_target_files.py

+2 −2
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ def LoadPartitionFiles(z, partition): 
      basefilename = info.filename[len(prefix):]

      fn = partition + "/" + basefilename

      data = z.read(info.filename)

      out[fn] = common.File(fn, data)

      out[fn] = common.File(fn, data, info.compress_size)

  return out
@@ -1392,7 +1392,7 @@ class FileDifference(object): 
    for diff in diffs:

      tf, sf, d = diff.GetPatch()

      path = "/".join(tf.name.split("/")[:-1])

      if d is None or len(d) > tf.size * OPTIONS.patch_threshold or \

      if d is None or len(d) > tf.compress_size * OPTIONS.patch_threshold or \

          path not in known_paths:

        # patch is almost as big as the file; don't bother patching

        # or a patch + rename cannot take place due to the target