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

Commit 805ab25e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "releasetools: Remove the assertion of not allowing thumbprint in Treble world."

parents 401fada3 42230120

tools/releasetools/ota_from_target_files.py

+0 −6
Original line number Diff line number Diff line
@@ -697,17 +697,11 @@ def AddCompatibilityArchiveIfTrebleEnabled(target_zip, output_zip, target_info, 
  if not HasTrebleEnabled(target_zip, target_info):

    return



  # We don't support OEM thumbprint in Treble world (which calculates

  # fingerprints in a different way as shown in CalculateFingerprint()).

  assert not target_info.oem_props



  # Full OTA carries the info for system/vendor both.

  if source_info is None:

    AddCompatibilityArchive(True, True)

    return



  assert not source_info.oem_props



  source_fp = source_info.fingerprint

  target_fp = target_info.fingerprint

  system_updated = source_fp != target_fp