StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2018-07-19 21:57:06 +00:00
committed by Gerrit Code Review
parent 401fada3f5 4223012099
commit 805ab25e05
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/ota_from_target_files.py
View File

@@ -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