commit cfec7d0f7ba4ed3264a608ebe61510b408551621
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 08 19:57:56 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 08 19:57:56 2024 +0000
tree 393746deb8e2fd6e59c4759505c707d7cd219b92
parent 5f4028b318ae62c5a3857a00284fca1512a3f1ab
parent 7a17cfd81acc96a4a459086b197ef3acc1ce9522

Merge changes I1a5615e9,I01a673e7 into main

* changes:
  Remove dependency on non-AB modules
  Make build_image output consistent for partitions w/o build.prop

tools/releasetools/Android.bp

diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp
index 4941c71..9385f0c 100644
--- a/tools/releasetools/Android.bp
+++ b/tools/releasetools/Android.bp
@@ -244,7 +244,6 @@
         "boot_signer",
         "brotli",
         "bsdiff",
-        "imgdiff",
         "lz4",
         "mkbootfs",
         "signapk",
@@ -308,7 +307,6 @@
         "brotli",
         "bsdiff",
         "deapexer",
-        "imgdiff",
         "lz4",
         "mkbootfs",
         "signapk",

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