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

Merge changes Ibbed6cf9,I31b36b42 into main

Browse Source 
* changes:
  ota_from_target_files: allow cow version override
  Add build configs for wearable tunables
This commit is contained in:
Daniel Zheng
2024-05-16 19:34:11 +00:00
committed by Gerrit Code Review
parent a32d67dd1a 60922a45ef
commit 7a61f499be
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tools/releasetools/ota_from_target_files.py
View File

@@ -914,12 +914,13 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
# and install time performance. All OTA's with
# both the source build and target build with VIRTUAL_AB_COW_VERSION = 3
# can support the new format. Otherwise, fallback on older versions
if not source_info.vabc_cow_version or not target_info.vabc_cow_version:
logger.info("Source or Target doesn't have VABC_COW_VERSION specified, default to version 2")
OPTIONS.vabc_cow_version = 2
elif source_info.vabc_cow_version != target_info.vabc_cow_version:
logger.info("Source and Target have different cow VABC_COW_VERSION specified, default to minimum version")
OPTIONS.vabc_cow_version = min(source_info.vabc_cow_version, target_info.vabc_cow_version)
if not OPTIONS.vabc_cow_version:
if not source_info.vabc_cow_version or not target_info.vabc_cow_version:
logger.info("Source or Target doesn't have VABC_COW_VERSION specified, default to version 2")
OPTIONS.vabc_cow_version = 2
elif source_info.vabc_cow_version != target_info.vabc_cow_version:
logger.info("Source and Target have different cow VABC_COW_VERSION specified, default to minimum version")
OPTIONS.vabc_cow_version = min(source_info.vabc_cow_version, target_info.vabc_cow_version)
# Virtual AB Compression was introduced in Androd S.
# Later, we backported VABC to Android R. But verity support was not
@@ -933,19 +934,20 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
assert "ab_partitions" in OPTIONS.info_dict, \
"META/ab_partitions.txt is required for ab_update."
source_info = None
if not target_info.vabc_cow_version:
if not OPTIONS.vabc_cow_version:
if not target_info.vabc_cow_version:
OPTIONS.vabc_cow_version = 2
elif target_info.vabc_cow_version >= "3" and target_info.vendor_api_level < 35:
logger.warning(
"This full OTA is configured to use VABC cow version"
" 3 which is supported since"
" Android API level 35, but device is "
"launched with {} . If this full OTA is"
" served to a device running old build, OTA might fail due to "
"unsupported vabc cow version. For safety, version 2 is used because "
"it's supported since day 1.".format(
target_info.vendor_api_level))
OPTIONS.vabc_cow_version = 2
elif target_info.vabc_cow_version >= "3" and target_info.vendor_api_level < 35:
logger.warning(
"This full OTA is configured to use VABC cow version"
" 3 which is supported since"
" Android API level 35, but device is "
"launched with {} . If this full OTA is"
" served to a device running old build, OTA might fail due to "
"unsupported vabc cow version. For safety, version 2 is used because "
"it's supported since day 1.".format(
target_info.vendor_api_level))
OPTIONS.vabc_cow_version = 2
if OPTIONS.vabc_compression_param is None and vabc_compression_param:
minimum_api_level_required = VABC_COMPRESSION_PARAM_SUPPORT[
vabc_compression_param]