am 7a864af1: am aa112716: Merge "build_image: Set file system labels on disk images"

* commit '7a864af1b72a278d7e83f2f1f6ac6da587d658c8':
  build_image: Set file system labels on disk images
This commit is contained in:
David Turner 2015-01-07 20:41:57 +00:00 committed by Android Git Automerger
commit 0d30007b38

View file

@ -248,6 +248,7 @@ def BuildImage(in_dir, prop_dict, out_file,
build_command.extend(["-C", fs_config])
if block_list is not None:
build_command.extend(["-B", block_list])
build_command.extend(["-L", prop_dict["mount_point"]])
if fc_config is not None:
build_command.append(fc_config)
elif "selinux_fc" in prop_dict: