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

Merge commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6' into gingerbread-plus-aosp

* commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6':
  Try to fix system.img in update zip file.
This commit is contained in:
Ying Wang 2010-08-26 15:25:53 -07:00 committed by Android Git Automerger
commit cef82129e1
1 changed files with 13 additions and 3 deletions

View File

@ -130,9 +130,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()