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

Merge "Fix bug where VABC xor is used on unsupported builds" am: c1edfc3b29 am: ea01d07642 am: e72c026778 am: d6ec917385

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

Change-Id: I6ae3bae4ce2e37961e039de50da114b4d54a80e9
This commit is contained in:
Treehugger Robot
2022-01-27 23:36:35 +00:00
committed by Automerger Merge Worker
parent 522fb21391 d6ec917385
commit 684c7fd0e5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/ota_from_target_files.py
View File

@@ -1105,7 +1105,12 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
if target_info.vendor_suppressed_vabc:
logger.info("Vendor suppressed VABC. Disabling")
OPTIONS.disable_vabc = True
if not target_info.is_vabc_xor or OPTIONS.disable_vabc:
# Both source and target build need to support VABC XOR for us to use it.
# Source build's update_engine must be able to write XOR ops, and target
# build's snapuserd must be able to interpret XOR ops.
if not target_info.is_vabc_xor or OPTIONS.disable_vabc or \
(source_info is not None and not source_info.is_vabc_xor):
logger.info("VABC XOR Not supported, disabling")
OPTIONS.enable_vabc_xor = False
additional_args = []