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

Check for vintf compatiblity early in generation process

Browse Source 
Currently CheckVintfIfTrebleEnabled is called after generating payload.
Users have to wait for ~1 hour before vintf is checked. Do the check
early and fail early.

Test: th
Change-Id: I2e4a8c7eaa62c94c92973c127b1d825a26e63b35
This commit is contained in:
Kelvin Zhang
2021-08-27 15:12:08 -07:00
parent d4bea32530
commit 414ca429cf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/ota_from_target_files.py
View File

@@ -1116,6 +1116,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
target_info.info_dict['ab_partitions'] = zfp.read( target_info.info_dict['ab_partitions'] = zfp.read(
AB_PARTITIONS).decode().strip().split("\n") AB_PARTITIONS).decode().strip().split("\n")
CheckVintfIfTrebleEnabled(target_file, target_info)
# Metadata to comply with Android OTA package format. # Metadata to comply with Android OTA package format.
metadata = GetPackageMetadata(target_info, source_info) metadata = GetPackageMetadata(target_info, source_info)
# Generate payload. # Generate payload.
@@ -1200,8 +1202,6 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
common.ZipClose(target_zip) common.ZipClose(target_zip)
CheckVintfIfTrebleEnabled(target_file, target_info)
# We haven't written the metadata entry yet, which will be handled in # We haven't written the metadata entry yet, which will be handled in
# FinalizeMetadata(). # FinalizeMetadata().
common.ZipClose(output_zip) common.ZipClose(output_zip)