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

Merge "bootimg supports v4 header" am: ca5e611e0a am: d279ff2313 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d909a9b7b195d6cc0fc3c6157f741b1912cc7e5
This commit is contained in:
Jiyong Park 2021-03-15 15:23:59 +00:00 committed by Automerger Merge Worker
parent cb76ff52c4 d279ff2313
commit 291df17d28
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
filesystem/bootimg.go
View File

@ -62,6 +62,10 @@ type bootimgProperties struct {
// Optional kernel commandline
Cmdline *string
// File that contains bootconfig parameters. This can be set only when `vendor_boot` is true
// and `header_version` is greater than or equal to 4.
Bootconfig *string `android:"arch_variant,path"`
// When set to true, sign the image with avbtool. Default is false.
Use_avb *bool
@ -189,6 +193,19 @@ func (b *bootimg) buildBootImage(ctx android.ModuleContext, vendor bool) android
return output
}
bootconfig := proptools.String(b.properties.Bootconfig)
if bootconfig != "" {
if !vendor {
ctx.PropertyErrorf("bootconfig", "requires vendor_boot: true")
return output
}
if verNum < 4 {
ctx.PropertyErrorf("bootconfig", "requires header_version: 4 or later")
return output
}
cmd.FlagWithInput("--vendor_bootconfig ", android.PathForModuleSrc(ctx, bootconfig))
}
flag := "--output "
if vendor {
flag = "--vendor_boot "