tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit '8c85549a3c8bf80eda3c3f5a738b18632e59f048':
  Use the basename of file_contexts from the info dict.
This commit is contained in:
Tao Bao 2015-08-28 19:03:02 +00:00 committed by Android Git Automerger
commit 7ea543b614
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/releasetools/common.py
View file

@ -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