resolved conflicts for merge of e1daf61d to master
Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9
diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files
index 7a32621..ef0f24c 100755
--- a/tools/releasetools/img_from_target_files
+++ b/tools/releasetools/img_from_target_files
@@ -115,7 +115,7 @@
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"]