From 13ebc021ecf71871cf58d11fa3eb8c04a54701fe Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 8 May 2019 12:37:08 -0700 Subject: [PATCH] releasetools: Update the comments regarding selinux_fc. The former comment no longer applies, as we have been always packing META/file_contexts.bin in a target_files.zip (commit aa7318c3, since Nougat), and we no longer look for the one under BOOT/RAMDISK/ (commit d14b8956, since Q). Test: N/A Change-Id: I03f361234bf440e942f21e5a624862590248544b --- tools/releasetools/common.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 495fec30b9..e6422978d2 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -332,10 +332,8 @@ def LoadInfoDict(input_file, repacking=False): raise ValueError("Failed to find 'fstab_version'") if repacking: - # We carry a copy of file_contexts.bin under META/. If not available, search - # BOOT/RAMDISK/. Note that sometimes we may need a different file to build - # images than the one running on device, in that case, we must have the one - # for image generation copied to META/. + # "selinux_fc" should point to the file_contexts file (file_contexts.bin) + # under META/. fc_basename = os.path.basename(d.get("selinux_fc", "file_contexts")) fc_config = os.path.join(input_file, "META", fc_basename) assert os.path.exists(fc_config)