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

Fix unified a/b zip generation failure

Browse Source 
If vendor model props are blacklisted, a/b zips fail to generate.
This uses a non-partition specific prop if the partition specific
variant does not exist.

Change-Id: I96f583ceb3ccebee21211b964e2ea66217ffd41f
Signed-off-by: RITEFANG <1721985272@qq.com>
This commit is contained in:
Aaron Kling
2023-05-25 12:02:17 -05:00
committed by SkyMinus
parent e7b9db3513
commit 3604743512
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/ota_utils.py
View File

@@ -223,9 +223,13 @@ def UpdateDeviceState(device_state, build_info, boot_variable_values,
partition_devices = set() partition_devices = set()
partition_fingerprints = set() partition_fingerprints = set()
for runtime_build_info in build_info_set: for runtime_build_info in build_info_set:
try:
partition_devices.add( partition_devices.add(
runtime_build_info.GetPartitionBuildProp('ro.product.device', runtime_build_info.GetPartitionBuildProp('ro.product.device',
partition)) partition))
except common.ExternalError:
partition_devices.add(
runtime_build_info.GetBuildProp('ro.product.device'))
partition_fingerprints.add( partition_fingerprints.add(
runtime_build_info.GetPartitionFingerprint(partition)) runtime_build_info.GetPartitionFingerprint(partition))