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

Commit 040ff2fe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args"... 

Merge "releasetools: Fallback to "mkbootimg_args" if "recovery_mkbootimg_args" not found." into rvc-dev am: 60f3ee64

Change-Id: I4263760a40102a6f3bd8874be2170902a355294b
parents 3ab4ee95 60f3ee64

tools/releasetools/common.py

+4 −0
Original line number Diff line number Diff line
@@ -1109,6 +1109,10 @@ def _BuildBootableImage(image_name, sourcedir, fs_config_file, info_dict=None, 


  if partition_name == "recovery":

    args = info_dict.get("recovery_mkbootimg_args")

    if not args:

      # Fall back to "mkbootimg_args" for recovery image

      # in case "recovery_mkbootimg_args" is not set.

      args = info_dict.get("mkbootimg_args")

  else:

    args = info_dict.get("mkbootimg_args")

  if args and args.strip():