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

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

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

Merge "releasetools: Remove the assertion of not allowing thumbprint in Treble world." am: 805ab25e am: b1750e28 am: 47a277fd
am: 87a70450

Change-Id: I54698bb4c3fe0723d0ef49163236ebee1fc2ced8
parents d2e6533d 87a70450

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