diff options
author | Doug Zongker <dougz@android.com> | 2010-09-03 14:31:03 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-03 14:31:03 -0700 |
commit | 93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9 (patch) | |
tree | 9eb8e96ff1fe4f63c885f4b4001fc19f31ea5e8e /tools | |
parent | c637db16d83b2c248b1cf0122e2ba558ed95762c (diff) | |
parent | 39a984550f1d478ff49f7a189ec776761c7f2ce5 (diff) | |
download | build-93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9.zip build-93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9.tar.gz build-93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9.tar.bz2 |
Merge "return to using subprocess for running commands" into gingerbread
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/releasetools/img_from_target_files | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files index 9bf373c..07eb648 100755 --- a/tools/releasetools/img_from_target_files +++ b/tools/releasetools/img_from_target_files @@ -126,19 +126,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() |