Add --os_version and --os_patch_level to bootimg
These flags were passed in make but not soong.
Also remove the ramdisk from boot.img because it actually wasn't
supposed to be used there, the ramdisk is used in init_boot.img.
Bug: 377562951
Test: Presubmits
Change-Id: I0391241d4b956788f855541684814bcf29614cb8
diff --git a/filesystem/bootimg.go b/filesystem/bootimg.go
index 226d95c..ab91eb4 100644
--- a/filesystem/bootimg.go
+++ b/filesystem/bootimg.go
@@ -146,6 +146,11 @@
cmd.FlagWithInput("--kernel ", android.PathForModuleSrc(ctx, kernel))
}
+ if !vendor {
+ cmd.FlagWithArg("--os_version ", ctx.Config().PlatformVersionLastStable())
+ cmd.FlagWithArg("--os_patch_level ", ctx.Config().PlatformSecurityPatch())
+ }
+
dtbName := proptools.String(b.properties.Dtb_prebuilt)
if dtbName != "" {
dtb := android.PathForModuleSrc(ctx, dtbName)