diff options
| -rw-r--r-- | android/variable.go | 31 | ||||
| -rw-r--r-- | fsgen/boot_imgs.go | 9 |
2 files changed, 25 insertions, 15 deletions
diff --git a/android/variable.go b/android/variable.go index 963c404e1..5e6f7b42a 100644 --- a/android/variable.go +++ b/android/variable.go @@ -614,21 +614,22 @@ type PartitionVariables struct { VendorSecurityPatch string `json:",omitempty"` // Boot image stuff - BuildingRamdiskImage bool `json:",omitempty"` - ProductBuildBootImage bool `json:",omitempty"` - ProductBuildVendorBootImage string `json:",omitempty"` - ProductBuildInitBootImage bool `json:",omitempty"` - BoardUsesRecoveryAsBoot bool `json:",omitempty"` - BoardPrebuiltBootimage string `json:",omitempty"` - BoardPrebuiltInitBootimage string `json:",omitempty"` - BoardBootimagePartitionSize string `json:",omitempty"` - BoardInitBootimagePartitionSize string `json:",omitempty"` - BoardBootHeaderVersion string `json:",omitempty"` - TargetKernelPath string `json:",omitempty"` - BoardUsesGenericKernelImage bool `json:",omitempty"` - BootSecurityPatch string `json:",omitempty"` - InitBootSecurityPatch string `json:",omitempty"` - BoardIncludeDtbInBootimg bool `json:",omitempty"` + BuildingRamdiskImage bool `json:",omitempty"` + ProductBuildBootImage bool `json:",omitempty"` + ProductBuildVendorBootImage string `json:",omitempty"` + ProductBuildInitBootImage bool `json:",omitempty"` + BoardUsesRecoveryAsBoot bool `json:",omitempty"` + BoardPrebuiltBootimage string `json:",omitempty"` + BoardPrebuiltInitBootimage string `json:",omitempty"` + BoardBootimagePartitionSize string `json:",omitempty"` + BoardInitBootimagePartitionSize string `json:",omitempty"` + BoardBootHeaderVersion string `json:",omitempty"` + TargetKernelPath string `json:",omitempty"` + BoardUsesGenericKernelImage bool `json:",omitempty"` + BootSecurityPatch string `json:",omitempty"` + InitBootSecurityPatch string `json:",omitempty"` + BoardIncludeDtbInBootimg bool `json:",omitempty"` + InternalKernelCmdline []string `json:",omitempty"` // Avb (android verified boot) stuff BoardAvbEnable bool `json:",omitempty"` diff --git a/fsgen/boot_imgs.go b/fsgen/boot_imgs.go index 4ccc90ac2..799dbc9e3 100644 --- a/fsgen/boot_imgs.go +++ b/fsgen/boot_imgs.go @@ -61,6 +61,11 @@ func createBootImage(ctx android.LoadHookContext, dtbImg dtbImg) bool { dtbPrebuilt = proptools.StringPtr(":" + dtbImg.name) } + var cmdline []string + if !buildingVendorBootImage(partitionVariables) { + cmdline = partitionVariables.InternalKernelCmdline + } + ctx.CreateModule( filesystem.BootimgFactory, &filesystem.BootimgProperties{ @@ -74,6 +79,7 @@ func createBootImage(ctx android.LoadHookContext, dtbImg dtbImg) bool { Avb_algorithm: avbInfo.avbAlgorithm, Security_patch: securityPatch, Dtb_prebuilt: dtbPrebuilt, + Cmdline: cmdline, }, &struct { Name *string @@ -96,6 +102,8 @@ func createVendorBootImage(ctx android.LoadHookContext, dtbImg dtbImg) bool { dtbPrebuilt = proptools.StringPtr(":" + dtbImg.name) } + cmdline := partitionVariables.InternalKernelCmdline + ctx.CreateModule( filesystem.BootimgFactory, &filesystem.BootimgProperties{ @@ -108,6 +116,7 @@ func createVendorBootImage(ctx android.LoadHookContext, dtbImg dtbImg) bool { Avb_rollback_index: avbInfo.avbRollbackIndex, Avb_algorithm: avbInfo.avbAlgorithm, Dtb_prebuilt: dtbPrebuilt, + Cmdline: cmdline, }, &struct { Name *string |