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

Commit 9016d0ae authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev

parents 2e619b7c e2e9f613

tools/releasetools/img_from_target_files

+8 −0
Original line number Diff line number Diff line
@@ -229,6 +229,14 @@ def main(argv): 
  OPTIONS.input_tmp, input_zip = common.UnzipTemp(args[0])

  OPTIONS.info_dict = common.LoadInfoDict(input_zip)



  # If this image was originally labelled with SELinux contexts, make sure we

  # also apply the labels in our new image. During building, the "file_contexts"

  # is in the out/ directory tree, but for repacking from target-files.zip it's

  # in the root directory of the ramdisk.

  if "selinux_fc" in OPTIONS.info_dict:

    OPTIONS.info_dict["selinux_fc"] = os.path.join(OPTIONS.input_tmp, "BOOT", "RAMDISK",

        "file_contexts")



  output_zip = zipfile.ZipFile(args[1], "w", compression=zipfile.ZIP_DEFLATED)



  common.GetBootableImage(

tools/releasetools/ota_from_target_files

+9 −0
Original line number Diff line number Diff line
@@ -789,6 +789,15 @@ def main(argv): 


  OPTIONS.target_tmp = OPTIONS.input_tmp

  OPTIONS.info_dict = common.LoadInfoDict(input_zip)



  # If this image was originally labelled with SELinux contexts, make sure we

  # also apply the labels in our new image. During building, the "file_contexts"

  # is in the out/ directory tree, but for repacking from target-files.zip it's

  # in the root directory of the ramdisk.

  if "selinux_fc" in OPTIONS.info_dict:

    OPTIONS.info_dict["selinux_fc"] = os.path.join(OPTIONS.input_tmp, "BOOT", "RAMDISK",

        "file_contexts")



  if OPTIONS.verbose:

    print "--- target info ---"

    common.DumpInfoDict(OPTIONS.info_dict)