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

Commit 79735a6a authored by Tao Bao's avatar Tao Bao
Browse files

Use the basename of file_contexts from the info dict. 

Changes in [1] break the backward compatibility of the OTA scripts. Fix
the issue by extracting the file basename from the info dict in
META/misc_info.txt.

[1] commit d3a803e6

Bug: 23620049
Change-Id: I40a5625bbe0beb295f34b2328906a4a4283fe59b
parent 57ff23b0

tools/releasetools/common.py

+3 −2
Original line number Diff line number Diff line
@@ -159,11 +159,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