p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 13871a8f: resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp 

* commit '13871a8f500b0f9a5e167be3487c1e8d1f92f327':
  Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
This commit is contained in:
Ying Wang 2013-09-13 17:56:51 -07:00 committed by Android Git Automerger
parent d55ce8bc86 13871a8f50
commit 717ee5ab0e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@ -1260,7 +1260,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
$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt
$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
@# Zip everything up, preserving symlinks

2
tools/releasetools/common.py
View File

@ -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])