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

Commit e2e9f613 authored by Kenny Root's avatar Kenny Root
Browse files

Fix signing process for SELinux file_contexts 

When not building locally and just using a target-files.zip from some
other build, it still tries to access the file_contexts from the out/
directory. This change instead looks at the unzipped target-files.zip
hierarchy to grab that information.

Bug: 9191141
Change-Id: I6ea12e82d6c6376fcada412314c5eefc97ff4853
parent a59f1b25

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)