commit c25bd3c8a0e0b521f2b9ab9d749320b0a2ee0b6f
author David Anderson <dvander@google.com> Sat Feb 19 01:28:24 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 19 01:28:24 2022 +0000
tree 4e993d3d2538dc9f677f5327848f5725a93cdc63
parent 68f7e845197144ad14f5cb9d1a01d995cda41549
parent 1c48b59aa17d729af2479784b59f58f2266ad148

Merge "Revise partition size for system_other.img"

tools/releasetools/build_image.py

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 4b5846d..dbd2c6f 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -705,7 +705,7 @@
       if mount_point not in allowed_partitions:
           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
       # after as needed.
       copy_prop(src_prop.format("system"), dest_prop)