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

Merge "Update check to work with compression levels" into main am: b7b838fd3b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2912702

Change-Id: I0c3241ab449b8c2887ba99a6b147c16e4c82aadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng
2024-01-16 22:05:24 +00:00
committed by Automerger Merge Worker
parent e75acf017d b7b838fd3b
commit 8f90739f3f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/ota_from_target_files.py
View File

@@ -856,10 +856,10 @@ def ExtractOrCopyTargetFiles(target_file):
return ExtractTargetFiles(target_file) return ExtractTargetFiles(target_file)
def ValidateCompressinParam(target_info): def ValidateCompressionParam(target_info):
vabc_compression_param = OPTIONS.vabc_compression_param vabc_compression_param = OPTIONS.vabc_compression_param
if vabc_compression_param: if vabc_compression_param:
minimum_api_level_required = VABC_COMPRESSION_PARAM_SUPPORT[vabc_compression_param] minimum_api_level_required = VABC_COMPRESSION_PARAM_SUPPORT[vabc_compression_param.split(",")[0]]
if target_info.vendor_api_level < minimum_api_level_required: if target_info.vendor_api_level < minimum_api_level_required:
raise ValueError("Specified VABC compression param {} is only supported for API level >= {}, device is on API level {}".format( raise ValueError("Specified VABC compression param {} is only supported for API level >= {}, device is on API level {}".format(
vabc_compression_param, minimum_api_level_required, target_info.vendor_api_level)) vabc_compression_param, minimum_api_level_required, target_info.vendor_api_level))
@@ -872,7 +872,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
target_info = common.BuildInfo(OPTIONS.info_dict, OPTIONS.oem_dicts) target_info = common.BuildInfo(OPTIONS.info_dict, OPTIONS.oem_dicts)
if OPTIONS.disable_vabc and target_info.is_release_key: if OPTIONS.disable_vabc and target_info.is_release_key:
raise ValueError("Disabling VABC on release-key builds is not supported.") raise ValueError("Disabling VABC on release-key builds is not supported.")
ValidateCompressinParam(target_info) ValidateCompressionParam(target_info)
vabc_compression_param = target_info.vabc_compression_param vabc_compression_param = target_info.vabc_compression_param
target_file = ExtractOrCopyTargetFiles(target_file) target_file = ExtractOrCopyTargetFiles(target_file)