StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4b7d8f11: Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS"

Browse Source 
* commit '4b7d8f119a15a21445d6bc872b8e36e6f848e846':
  Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
This commit is contained in:
Ying Wang
2013-09-13 17:43:34 -07:00
committed by Android Git Automerger
parent 169395bf1a 4b7d8f119a
commit 65d5e78865
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -1233,7 +1233,7 @@ endif
ifdef PRODUCT_EXTRA_RECOVERY_KEYS ifdef PRODUCT_EXTRA_RECOVERY_KEYS
$(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt $(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt
endif 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) $(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
@# Zip everything up, preserving symlinks @# Zip everything up, preserving symlinks
$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)

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) args = info_dict.get("mkbootimg_args", None)
if args and args.strip(): if args and args.strip():
cmd.extend(args.split()) cmd.extend(shlex.split(args))
cmd.extend(["--ramdisk", ramdisk_img.name, cmd.extend(["--ramdisk", ramdisk_img.name,
"--output", img.name]) "--output", img.name])