Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c9c335a authored Nov 19, 2024 by Cole Faust

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

parent bf3242d2

filesystem/bootimg.go

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -146,6 +146,11 @@ func (b *bootimg) buildBootImage(ctx android.ModuleContext, vendor bool) android
	cmd.FlagWithInput("--kernel ", android.PathForModuleSrc(ctx, kernel))		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)		dtbName := proptools.String(b.properties.Dtb_prebuilt)
	if dtbName != "" {		if dtbName != "" {
	dtb := android.PathForModuleSrc(ctx, dtbName)		dtb := android.PathForModuleSrc(ctx, dtbName)

fsgen/boot_imgs.go

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,6 @@ func createBootImage(ctx android.LoadHookContext) bool {
	filesystem.BootimgFactory,		filesystem.BootimgFactory,
	&filesystem.BootimgProperties{		&filesystem.BootimgProperties{
	Kernel_prebuilt: proptools.StringPtr(":" + kernelFilegroupName),		Kernel_prebuilt: proptools.StringPtr(":" + kernelFilegroupName),
	Ramdisk_module: proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "ramdisk")),
	Header_version: proptools.StringPtr(partitionVariables.BoardBootHeaderVersion),		Header_version: proptools.StringPtr(partitionVariables.BoardBootHeaderVersion),
	},		},
	&struct {		&struct {