From: Dan Albert <danalbert@google.com>
Date: Fri, 27 Mar 2015 18:40:02 +0000 (+0000)
Subject: Merge "Make releasetools pylint clean."
X-Git-Tag: android-x86-6.0-r1~144^2~56^2~59^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=99e22a57;p=android-x86%2Fbuild.git

Merge "Make releasetools pylint clean."
---

99e22a57d0b186cb853d757a058318a8be78918b
diff --cc tools/releasetools/add_img_to_target_files.py
index b3d2edeb3,97ed873fd..7984ad684
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@@ -130,25 -130,18 +130,27 @@@ def CreateImage(input_dir, info_dict, w
  
    fs_config = os.path.join(
        input_dir, "META/" + fs_config_prefix + "filesystem_config.txt")
-   if not os.path.exists(fs_config): fs_config = None
+   if not os.path.exists(fs_config):
+     fs_config = None
  
    fc_config = os.path.join(input_dir, "BOOT/RAMDISK/file_contexts")
-   if not os.path.exists(fc_config): fc_config = None
+   if not os.path.exists(fc_config):
+     fc_config = None
  
 +  # Override values loaded from info_dict.
 +  if fs_config:
 +    image_props["fs_config"] = fs_config
 +  if fc_config:
 +    image_props["selinux_fc"] = fc_config
 +  if block_list:
 +    image_props["block_list"] = block_list
 +  if image_props.get("system_root_image") == "true":
 +    image_props["ramdisk_dir"] = os.path.join(input_dir, "BOOT/RAMDISK")
 +    image_props["ramdisk_fs_config"] = os.path.join(
 +        input_dir, "META/boot_filesystem_config.txt")
 +
    succ = build_image.BuildImage(os.path.join(input_dir, what),
 -                                image_props, img,
 -                                fs_config=fs_config,
 -                                fc_config=fc_config,
 -                                block_list=block_list)
 +                                image_props, img)
    assert succ, "build " + what + ".img image failed"
  
    return img