Merge "Revise partition size for system_other.img" am: c25bd3c8a0 am: 1af04ccab7

Original change: https://android-review.googlesource.com/c/platform/build/+/1991771

Change-Id: I859d1a58e272518645841731e5b8b2c83f1e426e
This commit is contained in:
David Anderson 2022-02-19 02:05:37 +00:00 committed by Automerger Merge Worker
commit bf67d5cdf8

View file

@ -705,7 +705,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
if mount_point not in allowed_partitions: if mount_point not in allowed_partitions:
continue continue
if mount_point == "system_other": if (mount_point == "system_other") and (dest_prop != "partition_size"):
# Propagate system properties to system_other. They'll get overridden # Propagate system properties to system_other. They'll get overridden
# after as needed. # after as needed.
copy_prop(src_prop.format("system"), dest_prop) copy_prop(src_prop.format("system"), dest_prop)