diff options
| author | Jianxun Zhang <jianxun.zhang@intel.com> | 2013-04-17 15:19:19 -0700 |
|---|---|---|
| committer | Andrew Boie <andrew.p.boie@intel.com> | 2013-08-27 15:31:13 -0700 |
| commit | 098494981d03f47e4358496488c2664cfc655965 (patch) | |
| tree | c240a5382692f8f9f8037d3d78d78d00a0ed583a | |
| parent | d7a9f708870ebd82bc57e478541068bb7ed987c4 (diff) | |
| download | build-098494981d03f47e4358496488c2664cfc655965.zip build-098494981d03f47e4358496488c2664cfc655965.tar.gz build-098494981d03f47e4358496488c2664cfc655965.tar.bz2 | |
Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
The existing logic in common.py breaks string arguments incorrectly:
e.g. --para1 val1 --para2 "val2 is a string" will be output as:
'--para', 'val1, '--para2', 'val2' 'is' 'a' 'string'
This will cause mkbootimg command fails due to the invalid arguments
generated from the wrong parsing.
The patch fixes this issue to get:
'--para', 'val1, '--para2', 'val2 is a string'
Change-Id: Ia34ec357550f11ae9d6adc719d86a0c6a9099fbc
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | tools/releasetools/common.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index c5509c6..556fe0d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1233,7 +1233,7 @@ endif ifdef PRODUCT_EXTRA_RECOVERY_KEYS $(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt endif - $(hide) echo "mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)" >> $(zip_root)/META/misc_info.txt + $(hide) echo 'mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)' >> $(zip_root)/META/misc_info.txt $(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt) @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 05c2a4a..f179717 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -309,7 +309,7 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): args = info_dict.get("mkbootimg_args", None) if args and args.strip(): - cmd.extend(args.split()) + cmd.extend(shlex.split(args)) cmd.extend(["--ramdisk", ramdisk_img.name, "--output", img.name]) |