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

Merge "Allow boot_variable_file to be read from input_target_files" into main

Browse Source
This commit is contained in:
Ben Fennema
2024-04-25 17:11:20 +00:00
committed by Gerrit Code Review
parent 966e558e9f cd6de1bc7f
commit c6e4a86b03
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/ota_from_target_files.py
View File

@@ -195,6 +195,8 @@ A/B OTA specific options
ro.product.* properties are overridden by the 'import' statement. ro.product.* properties are overridden by the 'import' statement.
The file expects one property per line, and each line has the following The file expects one property per line, and each line has the following
format: 'prop_name=value1,value2'. e.g. 'ro.boot.product.sku=std,pro' format: 'prop_name=value1,value2'. e.g. 'ro.boot.product.sku=std,pro'
The path specified can either be relative to the current working directory
or the path to a file inside of input_target_files.
--skip_postinstall --skip_postinstall
Skip the postinstall hooks when generating an A/B OTA package (default: Skip the postinstall hooks when generating an A/B OTA package (default:
@@ -1048,6 +1050,10 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
from check_target_files_vintf import CheckVintfIfTrebleEnabled from check_target_files_vintf import CheckVintfIfTrebleEnabled
CheckVintfIfTrebleEnabled(target_file, target_info) CheckVintfIfTrebleEnabled(target_file, target_info)
# Allow boot_variable_file to also exist in target-files
if OPTIONS.boot_variable_file:
if not os.path.isfile(OPTIONS.boot_variable_file):
OPTIONS.boot_variable_file = os.path.join(target_file, OPTIONS.boot_variable_file)
# 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.