diff options
author | 2024-11-21 23:57:19 +0000 | |
---|---|---|
committer | 2024-11-26 18:19:23 +0000 | |
commit | 4004cc6aeee6d7724ac2c74d05122cd91184c339 (patch) | |
tree | 2364c9e2baacbba37d4c46114965c0c28acad4a2 | |
parent | 00a672accdd13fea25aafcd4e94220599976da25 (diff) |
Specify bootconfig property in vendor_boot.img
bootconfig is a path to the text file, created based on
`INTERNAL_BOOTCONFIG` and `INTERNAL_BOOTCONFIG_FILE`. This is done by
auto generating a newly introduced bootconfig module. The
output file of the genrule module is passed as a property to the
vendor_boot.img module.
Test: Inspect the content of the generated vendor-bootconfig.img file
Test: Inspect the ninja command of the autogen vendor_boot.img
Bug: 379945468
Change-Id: I9c693de681e6dad7399f80df05825cce9b0c1c22
-rw-r--r-- | android/variable.go | 2 | ||||
-rw-r--r-- | filesystem/Android.bp | 1 | ||||
-rw-r--r-- | filesystem/bootconfig.go | 80 | ||||
-rw-r--r-- | fsgen/boot_imgs.go | 32 |
4 files changed, 115 insertions, 0 deletions
diff --git a/android/variable.go b/android/variable.go index 36ddc1c81..5dd9b2910 100644 --- a/android/variable.go +++ b/android/variable.go @@ -629,6 +629,8 @@ type PartitionVariables struct { InitBootSecurityPatch string `json:",omitempty"` BoardIncludeDtbInBootimg bool `json:",omitempty"` InternalKernelCmdline []string `json:",omitempty"` + InternalBootconfig []string `json:",omitempty"` + InternalBootconfigFile string `json:",omitempty"` // Avb (android verified boot) stuff BoardAvbEnable bool `json:",omitempty"` diff --git a/filesystem/Android.bp b/filesystem/Android.bp index 23ec3da81..bbb3ea7d8 100644 --- a/filesystem/Android.bp +++ b/filesystem/Android.bp @@ -20,6 +20,7 @@ bootstrap_go_package { "avb_add_hash_footer.go", "avb_gen_vbmeta_image.go", "bootimg.go", + "bootconfig.go", "filesystem.go", "fsverity_metadata.go", "logical_partition.go", diff --git a/filesystem/bootconfig.go b/filesystem/bootconfig.go new file mode 100644 index 000000000..b125824b1 --- /dev/null +++ b/filesystem/bootconfig.go @@ -0,0 +1,80 @@ +// Copyright 2024 Google Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package filesystem + +import ( + "android/soong/android" + "strings" + + "github.com/google/blueprint/proptools" +) + +func init() { + android.RegisterModuleType("bootconfig", BootconfigModuleFactory) + pctx.Import("android/soong/android") +} + +type bootconfigProperty struct { + // List of bootconfig parameters that will be written as a line separated list in the output + // file. + Boot_config []string + // Path to the file that contains the list of bootconfig parameters. This will be appended + // to the output file, after the entries in boot_config. + Boot_config_file *string `android:"path"` +} + +type BootconfigModule struct { + android.ModuleBase + + properties bootconfigProperty +} + +// bootconfig module generates the `vendor-bootconfig.img` file, which lists the bootconfig +// parameters and can be passed as a `--vendor_bootconfig` value in mkbootimg invocation. +func BootconfigModuleFactory() android.Module { + module := &BootconfigModule{} + module.AddProperties(&module.properties) + android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + return module +} + +func (m *BootconfigModule) GenerateAndroidBuildActions(ctx android.ModuleContext) { + bootConfig := m.properties.Boot_config + bootConfigFileStr := proptools.String(m.properties.Boot_config_file) + if len(bootConfig) == 0 && len(bootConfigFileStr) == 0 { + return + } + + var bootConfigFile android.Path + if len(bootConfigFileStr) > 0 { + bootConfigFile = android.PathForModuleSrc(ctx, bootConfigFileStr) + } + + outputPath := android.PathForModuleOut(ctx, ctx.ModuleName(), "vendor-bootconfig.img") + bootConfigOutput := android.PathForModuleOut(ctx, ctx.ModuleName(), "bootconfig.txt") + android.WriteFileRule(ctx, bootConfigOutput, strings.Join(bootConfig, "\n")) + + bcFiles := android.Paths{bootConfigOutput} + if bootConfigFile != nil { + bcFiles = append(bcFiles, bootConfigFile) + } + ctx.Build(pctx, android.BuildParams{ + Rule: android.Cat, + Description: "concatenate bootconfig parameters", + Inputs: bcFiles, + Output: outputPath, + }) + ctx.SetOutputFiles(android.Paths{outputPath}, "") +} diff --git a/fsgen/boot_imgs.go b/fsgen/boot_imgs.go index 799dbc9e3..4e8072009 100644 --- a/fsgen/boot_imgs.go +++ b/fsgen/boot_imgs.go @@ -104,6 +104,11 @@ func createVendorBootImage(ctx android.LoadHookContext, dtbImg dtbImg) bool { cmdline := partitionVariables.InternalKernelCmdline + var vendorBootConfigImg *string + if name, ok := createVendorBootConfigImg(ctx); ok { + vendorBootConfigImg = proptools.StringPtr(":" + name) + } + ctx.CreateModule( filesystem.BootimgFactory, &filesystem.BootimgProperties{ @@ -117,6 +122,7 @@ func createVendorBootImage(ctx android.LoadHookContext, dtbImg dtbImg) bool { Avb_algorithm: avbInfo.avbAlgorithm, Dtb_prebuilt: dtbPrebuilt, Cmdline: cmdline, + Bootconfig: vendorBootConfigImg, }, &struct { Name *string @@ -283,3 +289,29 @@ func createDtbImgFilegroup(ctx android.LoadHookContext) dtbImg { } return dtbImg{include: false} } + +func createVendorBootConfigImg(ctx android.LoadHookContext) (string, bool) { + partitionVars := ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse + bootconfig := partitionVars.InternalBootconfig + bootconfigFile := partitionVars.InternalBootconfigFile + if len(bootconfig) == 0 && len(bootconfigFile) == 0 { + return "", false + } + + vendorBootconfigImgModuleName := generatedModuleName(ctx.Config(), "vendor_bootconfig_image") + + ctx.CreateModule( + filesystem.BootconfigModuleFactory, + &struct { + Name *string + Boot_config []string + Boot_config_file *string + }{ + Name: proptools.StringPtr(vendorBootconfigImgModuleName), + Boot_config: bootconfig, + Boot_config_file: proptools.StringPtr(bootconfigFile), + }, + ) + + return vendorBootconfigImgModuleName, true +} |