summaryrefslogtreecommitdiffstats
path: root/tools/releasetools
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2010-09-03 14:35:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-03 14:35:49 -0700
commit5c3dc2ad442fa97351dc619891727a2e8c9d640a (patch)
tree371671b4000d8341de340a439a9612888e319d1d /tools/releasetools
parentc60c1bafa0c20166c53666655e2dea7ff5bfd157 (diff)
parent9314823c06d4434bf18d589c2fdea490428becf8 (diff)
downloadbuild-5c3dc2ad442fa97351dc619891727a2e8c9d640a.zip
build-5c3dc2ad442fa97351dc619891727a2e8c9d640a.tar.gz
build-5c3dc2ad442fa97351dc619891727a2e8c9d640a.tar.bz2
am 9314823c: am 93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '9314823c06d4434bf18d589c2fdea490428becf8' * commit '9314823c06d4434bf18d589c2fdea490428becf8': return to using subprocess for running commands
Diffstat (limited to 'tools/releasetools')
-rwxr-xr-xtools/releasetools/img_from_target_files14
1 files changed, 4 insertions, 10 deletions
diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files
index 7acc1fd..17b6bc8 100755
--- a/tools/releasetools/img_from_target_files
+++ b/tools/releasetools/img_from_target_files
@@ -127,19 +127,13 @@ def AddSystem(output_zip):
else:
build_command = ["mkyaffs2image", "-f"]
if OPTIONS.mkyaffs2_extra_flags is not None:
- build_command.append(OPTIONS.mkyaffs2_extra_flags);
+ build_command.extend(OPTIONS.mkyaffs2_extra_flags.split());
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"
-
- # TODO: Why the above common.Run() generate different system.img for crespo?
- str_command = " ".join(build_command)
- print "running " + str_command
- exit_code = os.system(str_command)
- assert exit_code == 0, "build system.img image failed"
+ p = common.Run(build_command)
+ p.communicate()
+ assert p.returncode == 0, "build system.img image failed"
img.seek(os.SEEK_SET, 0)
data = img.read()