Merge "Revert "Build vbmeta partitions with soong"" into main (81f663e4) · Commits · e / os / android_build_soong

android/variable.go

+1 −14

Original line number	Diff line number	Diff line
		@@ -577,14 +577,6 @@ type PartitionQualifiedVariablesType struct {
		BoardAvbRollbackIndexLocation string `json:",omitempty"`
		}

		type ChainedAvbPartitionProps struct {
		Partitions []string `json:",omitempty"`
		Key string `json:",omitempty"`
		Algorithm string `json:",omitempty"`
		RollbackIndex string `json:",omitempty"`
		RollbackIndexLocation string `json:",omitempty"`
		}

		type PartitionVariables struct {
		ProductDirectory string `json:",omitempty"`
		PartitionQualifiedVariables map[string]PartitionQualifiedVariablesType
		@@ -610,11 +602,6 @@ type PartitionVariables struct {
		CopyImagesForTargetFilesZip bool `json:",omitempty"`

		BoardAvbEnable bool `json:",omitempty"`
		BoardAvbAlgorithm string `json:",omitempty"`
		BoardAvbKeyPath string `json:",omitempty"`
		BoardAvbRollbackIndex string `json:",omitempty"`
		BuildingVbmetaImage bool `json:",omitempty"`
		ChainedVbmetaPartitions map[string]ChainedAvbPartitionProps `json:",omitempty"`

		ProductPackages []string `json:",omitempty"`
		ProductPackagesDebug []string `json:",omitempty"`

filesystem/android_device.go

+1 −5

Original line number	Diff line number	Diff line
		@@ -34,8 +34,6 @@ type PartitionNameProperties struct {
		Vendor_partition_name *string
		// Name of the Odm partition filesystem module
		Odm_partition_name *string
		// The vbmeta partition and its "chained" partitions
		Vbmeta_partitions []string
		}

		type androidDevice struct {
		@@ -48,6 +46,7 @@ func AndroidDeviceFactory() android.Module {
		module := &androidDevice{}
		module.AddProperties(&module.partitionProps)
		android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)

		return module
		}

		@@ -70,9 +69,6 @@ func (a *androidDevice) DepsMutator(ctx android.BottomUpMutatorContext) {
		addDependencyIfDefined(a.partitionProps.Product_partition_name)
		addDependencyIfDefined(a.partitionProps.Vendor_partition_name)
		addDependencyIfDefined(a.partitionProps.Odm_partition_name)
		for _, vbmetaPartition := range a.partitionProps.Vbmeta_partitions {
		ctx.AddDependency(ctx.Module(), filesystemDepTag, vbmetaPartition)
		}
		}

		func (a *androidDevice) GenerateAndroidBuildActions(ctx android.ModuleContext) {

filesystem/vbmeta.go

+16 −12

Original line number	Diff line number	Diff line
		@@ -25,19 +25,19 @@ import (
		)

		func init() {
		android.RegisterModuleType("vbmeta", VbmetaFactory)
		android.RegisterModuleType("vbmeta", vbmetaFactory)
		}

		type vbmeta struct {
		android.ModuleBase

		properties VbmetaProperties
		properties vbmetaProperties

		output android.OutputPath
		installDir android.InstallPath
		}

		type VbmetaProperties struct {
		type vbmetaProperties struct {
		// Name of the partition stored in vbmeta desc. Defaults to the name of this module.
		Partition_name *string

		@@ -50,8 +50,9 @@ type VbmetaProperties struct {
		// Algorithm that avbtool will use to sign this vbmeta image. Default is SHA256_RSA4096.
		Algorithm *string

		// The rollback index. If unspecified, the rollback index is from PLATFORM_SECURITY_PATCH
		Rollback_index *int64
		// File whose content will provide the rollback index. If unspecified, the rollback index
		// is from PLATFORM_SECURITY_PATCH
		Rollback_index_file *string `android:"path"`

		// Rollback index location of this vbmeta image. Must be 0, 1, 2, etc. Default is 0.
		Rollback_index_location *int64
		@@ -61,7 +62,7 @@ type VbmetaProperties struct {
		Partitions proptools.Configurable[[]string]

		// List of chained partitions that this vbmeta deletages the verification.
		Chained_partitions []ChainedPartitionProperties
		Chained_partitions []chainedPartitionProperties

		// List of key-value pair of avb properties
		Avb_properties []avbProperty
		@@ -75,7 +76,7 @@ type avbProperty struct {
		Value *string
		}

		type ChainedPartitionProperties struct {
		type chainedPartitionProperties struct {
		// Name of the chained partition
		Name *string

		@@ -94,7 +95,7 @@ type ChainedPartitionProperties struct {
		}

		// vbmeta is the partition image that has the verification information for other partitions.
		func VbmetaFactory() android.Module {
		func vbmetaFactory() android.Module {
		module := &vbmeta{}
		module.AddProperties(&module.properties)
		android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
		@@ -216,12 +217,15 @@ func (v *vbmeta) GenerateAndroidBuildActions(ctx android.ModuleContext) {

		// Returns the embedded shell command that prints the rollback index
		func (v *vbmeta) rollbackIndexCommand(ctx android.ModuleContext) string {
		if v.properties.Rollback_index != nil {
		return fmt.Sprintf("%d", *v.properties.Rollback_index)
		var cmd string
		if v.properties.Rollback_index_file != nil {
		f := android.PathForModuleSrc(ctx, proptools.String(v.properties.Rollback_index_file))
		cmd = "cat " + f.String()
		} else {
		// Take the first line and remove the newline char
		return "$(date -d 'TZ=\"GMT\" " + ctx.Config().PlatformSecurityPatch() + "' +%s \| head -1 \| tr -d '\n'" + ")"
		cmd = "date -d 'TZ=\"GMT\" " + ctx.Config().PlatformSecurityPatch() + "' +%s"
		}
		// Take the first line and remove the newline char
		return "$(" + cmd + " \| head -1 \| tr -d '\n'" + ")"
		}

		// Extract public keys from chained_partitions.private_key. The keys are indexed with the partition

fsgen/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ bootstrap_go_package {
		"filesystem_creator.go",
		"fsgen_mutators.go",
		"prebuilt_etc_modules_gen.go",
		"vbmeta_partitions.go",
		],
		testSrcs: [
		"filesystem_creator_test.go",

fsgen/filesystem_creator.go

+10 −60

Original line number	Diff line number	Diff line
		@@ -44,9 +44,6 @@ func registerBuildComponents(ctx android.RegistrationContext) {
		type filesystemCreatorProps struct {
		Generated_partition_types []string `blueprint:"mutated"`
		Unsupported_partition_types []string `blueprint:"mutated"`

		Vbmeta_module_names []string `blueprint:"mutated"`
		Vbmeta_partition_names []string `blueprint:"mutated"`
		}

		type filesystemCreator struct {
		@@ -70,24 +67,16 @@ func filesystemCreatorFactory() android.Module {
		}

		func (f *filesystemCreator) createInternalModules(ctx android.LoadHookContext) {
		soongGeneratedPartitions := generatedPartitions(ctx)
		finalSoongGeneratedPartitions := make([]string, 0, len(soongGeneratedPartitions))
		for _, partitionType := range soongGeneratedPartitions {
		soongGeneratedPartitions := &ctx.Config().Get(fsGenStateOnceKey).(*FsGenState).soongGeneratedPartitions
		for _, partitionType := range *soongGeneratedPartitions {
		if f.createPartition(ctx, partitionType) {
		f.properties.Generated_partition_types = append(f.properties.Generated_partition_types, partitionType)
		finalSoongGeneratedPartitions = append(finalSoongGeneratedPartitions, partitionType)
		} else {
		f.properties.Unsupported_partition_types = append(f.properties.Unsupported_partition_types, partitionType)
		_, soongGeneratedPartitions = android.RemoveFromList(partitionType, soongGeneratedPartitions)
		}
		}

		for _, x := range createVbmetaPartitions(ctx, finalSoongGeneratedPartitions) {
		f.properties.Vbmeta_module_names = append(f.properties.Vbmeta_module_names, x.moduleName)
		f.properties.Vbmeta_partition_names = append(f.properties.Vbmeta_partition_names, x.partitionName)
		}

		ctx.Config().Get(fsGenStateOnceKey).(*FsGenState).soongGeneratedPartitions = finalSoongGeneratedPartitions
		f.createDeviceModule(ctx, finalSoongGeneratedPartitions, f.properties.Vbmeta_module_names)
		f.createDeviceModule(ctx)
		}

		func generatedModuleName(cfg android.Config, suffix string) string {
		@@ -102,11 +91,7 @@ func generatedModuleNameForPartition(cfg android.Config, partitionType string) s
		return generatedModuleName(cfg, fmt.Sprintf("%s_image", partitionType))
		}

		func (f *filesystemCreator) createDeviceModule(
		ctx android.LoadHookContext,
		generatedPartitionTypes []string,
		vbmetaPartitions []string,
		) {
		func (f *filesystemCreator) createDeviceModule(ctx android.LoadHookContext) {
		baseProps := &struct {
		Name *string
		}{
		@@ -115,22 +100,21 @@ func (f *filesystemCreator) createDeviceModule(

		// Currently, only the system and system_ext partition module is created.
		partitionProps := &filesystem.PartitionNameProperties{}
		if android.InList("system", generatedPartitionTypes) {
		if android.InList("system", f.properties.Generated_partition_types) {
		partitionProps.System_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "system"))
		}
		if android.InList("system_ext", generatedPartitionTypes) {
		if android.InList("system_ext", f.properties.Generated_partition_types) {
		partitionProps.System_ext_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "system_ext"))
		}
		if android.InList("vendor", generatedPartitionTypes) {
		if android.InList("vendor", f.properties.Generated_partition_types) {
		partitionProps.Vendor_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "vendor"))
		}
		if android.InList("product", generatedPartitionTypes) {
		if android.InList("product", f.properties.Generated_partition_types) {
		partitionProps.Product_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "product"))
		}
		if android.InList("odm", generatedPartitionTypes) {
		if android.InList("odm", f.properties.Generated_partition_types) {
		partitionProps.Odm_partition_name = proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), "odm"))
		}
		partitionProps.Vbmeta_partitions = vbmetaPartitions

		ctx.CreateModule(filesystem.AndroidDeviceFactory, baseProps, partitionProps)
		}
		@@ -360,15 +344,12 @@ func (f *filesystemCreator) createLinkerConfigSourceFilegroups(ctx android.LoadH
		type filesystemBaseProperty struct {
		Name *string
		Compile_multilib *string
		Visibility []string
		}

		func generateBaseProps(namePtr string) filesystemBaseProperty {
		return &filesystemBaseProperty{
		Name: namePtr,
		Compile_multilib: proptools.StringPtr("both"),
		// The vbmeta modules are currently in the root directory and depend on the partitions
		Visibility: []string{"//.", "//build/soong:__subpackages__"},
		}
		}

		@@ -464,42 +445,16 @@ func createFailingCommand(ctx android.ModuleContext, message string) android.Pat
		return file
		}

		func createVbmetaDiff(ctx android.ModuleContext, vbmetaModuleName string, vbmetaPartitionName string) android.Path {
		vbmetaModule := ctx.GetDirectDepWithTag(vbmetaModuleName, generatedVbmetaPartitionDepTag)
		outputFilesProvider, ok := android.OtherModuleProvider(ctx, vbmetaModule, android.OutputFilesProvider)
		if !ok {
		ctx.ModuleErrorf("Expected module %s to provide OutputFiles", vbmetaModule)
		}
		if len(outputFilesProvider.DefaultOutputFiles) != 1 {
		ctx.ModuleErrorf("Expected 1 output file from module %s", vbmetaModule)
		}
		soongVbMetaFile := outputFilesProvider.DefaultOutputFiles[0]
		makeVbmetaFile := android.PathForArbitraryOutput(ctx, fmt.Sprintf("target/product/%s/%s.img", ctx.Config().DeviceName(), vbmetaPartitionName))

		diffTestResultFile := android.PathForModuleOut(ctx, fmt.Sprintf("diff_test_%s.txt", vbmetaModuleName))
		builder := android.NewRuleBuilder(pctx, ctx)
		builder.Command().Text("diff").
		Input(soongVbMetaFile).
		Input(makeVbmetaFile)
		builder.Command().Text("touch").Output(diffTestResultFile)
		builder.Build(vbmetaModuleName+" diff test", vbmetaModuleName+" diff test")
		return diffTestResultFile
		}

		type systemImageDepTagType struct {
		blueprint.BaseDependencyTag
		}

		var generatedFilesystemDepTag systemImageDepTagType
		var generatedVbmetaPartitionDepTag systemImageDepTagType

		func (f *filesystemCreator) DepsMutator(ctx android.BottomUpMutatorContext) {
		for _, partitionType := range f.properties.Generated_partition_types {
		ctx.AddDependency(ctx.Module(), generatedFilesystemDepTag, generatedModuleNameForPartition(ctx.Config(), partitionType))
		}
		for _, vbmetaModule := range f.properties.Vbmeta_module_names {
		ctx.AddDependency(ctx.Module(), generatedVbmetaPartitionDepTag, vbmetaModule)
		}
		}

		func (f *filesystemCreator) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		@@ -529,11 +484,6 @@ func (f *filesystemCreator) GenerateAndroidBuildActions(ctx android.ModuleContex
		diffTestFiles = append(diffTestFiles, diffTestFile)
		ctx.Phony(fmt.Sprintf("soong_generated_%s_filesystem_test", partitionType), diffTestFile)
		}
		for i, vbmetaModule := range f.properties.Vbmeta_module_names {
		diffTestFile := createVbmetaDiff(ctx, vbmetaModule, f.properties.Vbmeta_partition_names[i])
		diffTestFiles = append(diffTestFiles, diffTestFile)
		ctx.Phony(fmt.Sprintf("soong_generated_%s_filesystem_test", f.properties.Vbmeta_partition_names[i]), diffTestFile)
		}
		ctx.Phony("soong_generated_filesystem_tests", diffTestFiles...)
		}