commit 4dc089971bb1a2257cf1cc8c80e2b97b7be44086
author Kelvin Zhang <zhangkelvin@google.com> Wed Mar 27 10:22:20 2024 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Tue Apr 02 09:05:08 2024 -0700
tree 66f713cd454fa1583af59e79adad56a7cc982da0
parent eb59dd9cbd4519a5aa7405cb605220de9763f557

Make build_image output consistent for partitions w/o build.prop

Bug: 331405669
Change-Id: I01a673e7c842a5042d85f079e29c680c4d7b589c

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 8836248..264c2d8 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -955,6 +955,13 @@
   d["build.prop"] = d["system.build.prop"]
 
   if d.get("avb_enable") == "true":
+    build_info = BuildInfo(d, use_legacy_id=True)
+    # Set up the salt for partitions without build.prop
+    if build_info.fingerprint:
+      if "fingerprint" not in d:
+        d["fingerprint"] = build_info.fingerprint
+      if "avb_salt" not in d:
+        d["avb_salt"] = sha256(build_info.fingerprint.encode()).hexdigest()
     # Set the vbmeta digest if exists
     try:
       d["vbmeta_digest"] = read_helper("META/vbmeta_digest.txt").rstrip()