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

Commit ec788a7f 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." am: ec8abc0e

Change-Id: Ide9def470d3372c50f6abf88612f057701060a50
parents c0793d73 ec8abc0e

tools/releasetools/common.py

+4 −0
Original line number Diff line number Diff line
@@ -1148,6 +1148,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():