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

Merge changes I674ad741,I908043ba

Browse Source 
* changes:
  Disable VABC xor if COW isn't compressed
  Fix secondary payload generation
This commit is contained in:
Treehugger Robot
2023-03-08 02:03:33 +00:00
committed by Gerrit Code Review
parent cd10355f3e 88043be8c3
commit cee4ebf1c3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/ota_from_target_files.py
View File

@@ -897,6 +897,10 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
(source_info is not None and not source_info.is_vabc_xor): (source_info is not None and not source_info.is_vabc_xor):
logger.info("VABC XOR Not supported, disabling") logger.info("VABC XOR Not supported, disabling")
OPTIONS.enable_vabc_xor = False OPTIONS.enable_vabc_xor = False
if OPTIONS.vabc_compression_param == "none":
logger.info("VABC Compression algorithm is set to 'none', disabling VABC xor")
OPTIONS.enable_vabc_xor = False
additional_args = [] additional_args = []
# Prepare custom images. # Prepare custom images.
@@ -927,7 +931,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
# 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.
payload = PayloadGenerator(OPTIONS.include_secondary, OPTIONS.wipe_user_data) payload = PayloadGenerator(wipe_user_data=OPTIONS.wipe_user_data)
partition_timestamps_flags = [] partition_timestamps_flags = []
# Enforce a max timestamp this payload can be applied on top of. # Enforce a max timestamp this payload can be applied on top of.