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

Commit 1e896103 authored by Daniel Mentz's avatar Daniel Mentz Committed by android-build-merger
Browse files

Merge "Consider search_path to locate avb_*_key_path files" 

am: 11dc247b

Change-Id: Ie0479fe88e37b330bc80fb6cb68d906546c70b0a
parents 066f23b7 11dc247b

tools/releasetools/common.py

+8 −0
Original line number Diff line number Diff line
@@ -616,6 +616,10 @@ def AppendAVBSigningArgs(cmd, partition): 
  """Append signing arguments for avbtool."""

  # e.g., "--key path/to/signing_key --algorithm SHA256_RSA4096"

  key_path = OPTIONS.info_dict.get("avb_" + partition + "_key_path")

  if key_path and not os.path.exists(key_path) and OPTIONS.search_path:

    new_key_path = os.path.join(OPTIONS.search_path, key_path)

    if os.path.exists(new_key_path):

      key_path = new_key_path

  algorithm = OPTIONS.info_dict.get("avb_" + partition + "_algorithm")

  if key_path and algorithm:

    cmd.extend(["--key", key_path, "--algorithm", algorithm])
@@ -668,6 +672,10 @@ def GetAvbChainedPartitionArg(partition, info_dict, key=None): 
  """

  if key is None:

    key = info_dict["avb_" + partition + "_key_path"]

  if key and not os.path.exists(key) and OPTIONS.search_path:

    new_key_path = os.path.join(OPTIONS.search_path, key)

    if os.path.exists(new_key_path):

      key = new_key_path

  pubkey_path = ExtractAvbPublicKey(info_dict["avb_avbtool"], key)

  rollback_index_location = info_dict[

      "avb_" + partition + "_rollback_index_location"]