am cef82129: am aa6dbe21: Try to fix system.img in update zip file.

Merge commit 'cef82129e1b2a26f883c20521d79175747eac434'

* commit 'cef82129e1b2a26f883c20521d79175747eac434':
  Try to fix system.img in update zip file.

1 files changed, 13 insertions, 3 deletions

diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files
index b1f67a6..ebf67eb 100755
--- a/tools/releasetools/img_from_target_files
+++ b/tools/releasetools/img_from_target_files
@@ -131,9 +131,19 @@ def AddSystem(output_zip):
     build_command.append(os.path.join(OPTIONS.input_tmp, "system"))
     build_command.append(img.name)
 
-  p = common.Run(build_command)
-  p.communicate()
-  assert p.returncode == 0, "build system.img image failed"
+  # p = common.Run(build_command)
+  # p.communicate()
+  # assert p.returncode == 0, "build system.img image failed"
+
+  # TODO: Why the above common.Run() generate different system.img for crespo?
+  str_command = "mkyaffs2image -f ";
+  if OPTIONS.mkyaffs2_extra_flags is not None:
+    str_command = str_command + OPTIONS.mkyaffs2_extra_flags
+  str_command = str_command + " " + os.path.join(OPTIONS.input_tmp, "system") + " " + img.name
+
+  print "running " + str_command
+  exit_code = os.system(str_command)
+  assert exit_code == 0, "build system.img image failed"
 
   img.seek(os.SEEK_SET, 0)
   data = img.read()