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

Commit c9ff5102 authored by Tao Bao's avatar Tao Bao Committed by Android Git Automerger
Browse files

am 35da9685: Merge "Use the basename of file_contexts from the info dict." 

* commit '35da9685':
  Use the basename of file_contexts from the info dict.
parents d1746299 35da9685

tools/releasetools/common.py

+3 −2
Original line number Diff line number Diff line
@@ -162,11 +162,12 @@ def LoadInfoDict(input_file, input_dir=None): 
    # to build images than the one running on device, such as when enabling

    # system_root_image. In that case, we must have the one for image

    # generation copied to META/.

    fc_config = os.path.join(input_dir, "META", "file_contexts.bin")

    fc_basename = os.path.basename(d.get("selinux_fc", "file_contexts"))

    fc_config = os.path.join(input_dir, "META", fc_basename)

    if d.get("system_root_image") == "true":

      assert os.path.exists(fc_config)

    if not os.path.exists(fc_config):

      fc_config = os.path.join(input_dir, "BOOT", "RAMDISK", "file_contexts.bin")

      fc_config = os.path.join(input_dir, "BOOT", "RAMDISK", fc_basename)

      if not os.path.exists(fc_config):

        fc_config = None