From 36047435123c906984f55b8fad6d3f04bb8251d8 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Thu, 25 May 2023 12:02:17 -0500 Subject: [PATCH] Fix unified a/b zip generation failure 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> --- tools/releasetools/ota_utils.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py index 81bc78e5a5..0da9fefedd 100644 --- a/tools/releasetools/ota_utils.py +++ b/tools/releasetools/ota_utils.py @@ -223,9 +223,13 @@ def UpdateDeviceState(device_state, build_info, boot_variable_values, partition_devices = set() partition_fingerprints = set() for runtime_build_info in build_info_set: - partition_devices.add( - runtime_build_info.GetPartitionBuildProp('ro.product.device', - partition)) + try: + partition_devices.add( + runtime_build_info.GetPartitionBuildProp('ro.product.device', + partition)) + except common.ExternalError: + partition_devices.add( + runtime_build_info.GetBuildProp('ro.product.device')) partition_fingerprints.add( runtime_build_info.GetPartitionFingerprint(partition))