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

Commit 42230120 authored by Tao Bao's avatar Tao Bao
Browse files

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

The claim in the original CL doesn't seem to hold. We may still have
devices using both of thumbprint and Treble compatibility check.

Bug: 111640956
Test; python -m unittest test_ota_from_target_files
Test: Build an incremental package for a target using thumbprints.
Change-Id: Ia491d5279901c2385d1c30802abcb99d65d919cc
parent 25e4495d

tools/releasetools/ota_from_target_files.py

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

  if not HasTrebleEnabled(target_zip, target_info):

    return

    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.

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

  if source_info is None:

  if source_info is None:

    AddCompatibilityArchive(True, True)

    AddCompatibilityArchive(True, True)

    return

    return





  assert not source_info.oem_props



  source_fp = source_info.fingerprint

  source_fp = source_info.fingerprint

  target_fp = target_info.fingerprint

  target_fp = target_info.fingerprint

  system_updated = source_fp != target_fp

  system_updated = source_fp != target_fp