Merge "dynamic partition update order is deterministic." am: 47b53c4136 am: 983dd182c7

am: 52fb92e735

Change-Id: Ia4b31a6394c0a4f49bfcbfc1f4c19f4fc2838a1c
This commit is contained in:
Yifan Hong
2019-01-28 23:05:00 -08:00
committed by android-build-merger

View File

@@ -2226,7 +2226,7 @@ class DynamicPartitionsDifference(object):
collections.Counter(e.partition for e in block_diffs).items() collections.Counter(e.partition for e in block_diffs).items()
if count > 1]) if count > 1])
self._partition_updates = dict() self._partition_updates = collections.OrderedDict()
for p, block_diff in block_diff_dict.items(): for p, block_diff in block_diff_dict.items():
self._partition_updates[p] = DynamicPartitionUpdate() self._partition_updates[p] = DynamicPartitionUpdate()
@@ -2277,7 +2277,7 @@ class DynamicPartitionsDifference(object):
logger.info("Updating dynamic partitions %s", logger.info("Updating dynamic partitions %s",
self._partition_updates.keys()) self._partition_updates.keys())
self._group_updates = dict() self._group_updates = collections.OrderedDict()
for g in tgt_groups: for g in tgt_groups:
self._group_updates[g] = DynamicGroupUpdate() self._group_updates[g] = DynamicGroupUpdate()