Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9788d8d3 authored by Aaron Kling's avatar Aaron Kling
Browse files

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
parent b06ec260

tools/releasetools/ota_utils.py

+8 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import struct 
import zipfile



import ota_metadata_pb2

import common

from common import (ZipDelete, ZipClose, OPTIONS, MakeTempFile,

                    ZipWriteStr, BuildInfo, LoadDictionaryFromFile,

                    SignFile, PARTITIONS_WITH_BUILD_PROP, PartitionBuildProps)
@@ -190,9 +191,13 @@ def UpdateDeviceState(device_state, build_info, boot_variable_values, 
      partition_devices = set()

      partition_fingerprints = set()

      for runtime_build_info in build_info_set:

        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))