openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bootimg.cmdline to use ShellEscapeIncludingSpaces 

bootimg.cmdline should be passed to mkbootimg's --cmdline flag as a
single argument. Because cmdline can have spaces we should escape it
with ShellEscapeIncludingSpaces rather than blindly putting double
qoutes with ShellEscape, which also puts single quotes when necessary.

Bug: 182092664
Test: m nothing && see build.ninja (microdroid's build commands)
Test: boot microdroid on VIM3L
Change-Id: I5d766bb0a816d829569c9ebfddf97c4f846f78f8
This commit is contained in:
Jooyung Han 2021-03-08 20:54:16 +09:00
parent dfa33be445
commit 32cddd0ba5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filesystem/bootimg.go
View File

@ -153,7 +153,7 @@ func (b *bootimg) buildBootImage(ctx android.ModuleContext, vendor bool) android
if vendor { if vendor {
flag = "--vendor_cmdline " flag = "--vendor_cmdline "
} }
cmd.FlagWithArg(flag, "\""+proptools.ShellEscape(cmdline)+"\"") cmd.FlagWithArg(flag, proptools.ShellEscapeIncludingSpaces(cmdline))
} }
headerVersion := proptools.String(b.properties.Header_version) headerVersion := proptools.String(b.properties.Header_version)