From 42230120992afdd4584e9ef23cb8ce30a8d782a6 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 19 Jul 2018 10:11:10 -0700 Subject: [PATCH] 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 --- tools/releasetools/ota_from_target_files.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 26d4187899..b9c410f036 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -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