resolved conflicts for merge of e1daf61d to master

Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9
2010-09-21 20:10:32 -07:00
parent 58118ccc56 e1daf61d43
commit 539db3b845
1 changed files with 1 additions and 1 deletions
--- a/tools/releasetools/img_from_target_files
+++ b/tools/releasetools/img_from_target_files
@@ -115,7 +115,7 @@ def AddSystem(output_zip):
    build_command = ["mkuserimg.sh",
                     os.path.join(OPTIONS.input_tmp, "system"), img.name,
                     fstab["/system"].fs_type, "system"]
-    if "system_img" in OPTIONS.info_dict:
+    if "system_size" in OPTIONS.info_dict:
      build_command.append(str(OPTIONS.info_dict["system_size"]))
  else:
    build_command = ["mkyaffs2image", "-f"]