diff options
| author | Doug Zongker <dougz@android.com> | 2009-06-15 22:36:37 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@android.com> | 2009-06-15 22:36:37 -0700 |
| commit | 171f1cde104891840b0c3c271935fae5433f1b25 (patch) | |
| tree | c8c26f7a08e3c7cdfc2404eac320c5ba8b02a701 /tools/releasetools/common.py | |
| parent | 93521c42e4e91136b3506ce4f472411dc420a29a (diff) | |
| download | build-171f1cde104891840b0c3c271935fae5433f1b25.zip build-171f1cde104891840b0c3c271935fae5433f1b25.tar.gz build-171f1cde104891840b0c3c271935fae5433f1b25.tar.bz2 | |
don't require some OTA features
Make the following things optional:
- kernel command lines for bootable images
- radio images
- bootloader assertions
These are not all (yet?) defined for some new devices.
Diffstat (limited to 'tools/releasetools/common.py')
| -rw-r--r-- | tools/releasetools/common.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 033ba22..3463745 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -90,11 +90,15 @@ def BuildBootableImage(sourcedir): assert p1.returncode == 0, "mkbootfs of %s ramdisk failed" % (targetname,) assert p2.returncode == 0, "minigzip of %s ramdisk failed" % (targetname,) - cmdline = open(os.path.join(sourcedir, "cmdline")).read().rstrip("\n") + fn = os.path.join(sourcedir, "cmdline") + if os.access(fn, os.F_OK): + cmdline = ["--cmdline", open(fn).read().rstrip("\n")] + else: + cmdline = [] p = Run(["mkbootimg", - "--kernel", os.path.join(sourcedir, "kernel"), - "--cmdline", cmdline, - "--ramdisk", ramdisk_img.name, + "--kernel", os.path.join(sourcedir, "kernel")] + + cmdline + + ["--ramdisk", ramdisk_img.name, "--output", img.name], stdout=subprocess.PIPE) p.communicate() |