Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfec7d0f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I1a5615e9,I01a673e7 into main 

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

tools/releasetools/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ python_library_host { 
        "boot_signer",

        "brotli",

        "bsdiff",

        "imgdiff",

        "lz4",

        "mkbootfs",

        "signapk",
@@ -308,7 +307,6 @@ python_defaults { 
        "brotli",

        "bsdiff",

        "deapexer",

        "imgdiff",

        "lz4",

        "mkbootfs",

        "signapk",

tools/releasetools/common.py

+7 −0
Original line number Diff line number Diff line
@@ -955,6 +955,13 @@ def LoadInfoDict(input_file, repacking=False): 
  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()