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

Commit fad576fa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update $PRODUCT_OUT from the soong system image files" into main am:... 

Merge "Update $PRODUCT_OUT from the soong system image files" into main am: 3507a28d am: 88a81fe2

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3247732



Change-Id: I0c047a0d0b9d9a14139b614278de760b759c710c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4767e005 88a81fe2

filesystem/filesystem.go

+13 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ type filesystemProperties struct { 
	// Install aconfig_flags.pb file for the modules installed in this partition.

	Gen_aconfig_flags_pb *bool



	// Update the Base_dir of the $PRODUCT_OUT directory with the packaging files.

	Update_product_out *bool



	Fsverity fsverityProperties

}
@@ -331,6 +334,14 @@ func (f *filesystem) copyPackagingSpecs(ctx android.ModuleContext, builder *andr 
	return f.CopySpecsToDirs(ctx, builder, dirsToSpecs)

}



func (f *filesystem) copyFilesToProductOut(ctx android.ModuleContext, builder *android.RuleBuilder, rebasedDir android.OutputPath) {

	if !proptools.Bool(f.properties.Update_product_out) {

		return

	}

	installPath := android.PathForModuleInPartitionInstall(ctx, f.partitionName())

	builder.Command().Textf("cp -prf %s/* %s", rebasedDir, installPath)

}



func (f *filesystem) buildImageUsingBuildImage(ctx android.ModuleContext) android.OutputPath {

	rootDir := android.PathForModuleOut(ctx, "root").OutputPath

	rebasedDir := rootDir
@@ -348,6 +359,7 @@ func (f *filesystem) buildImageUsingBuildImage(ctx android.ModuleContext) androi 
	f.buildFsverityMetadataFiles(ctx, builder, specs, rootDir, rebasedDir)

	f.buildEventLogtagsFile(ctx, builder, rebasedDir)

	f.buildAconfigFlagsFiles(ctx, builder, specs, rebasedDir)

	f.copyFilesToProductOut(ctx, builder, rebasedDir)



	// run host_init_verifier

	// Ideally we should have a concept of pluggable linters that verify the generated image.
@@ -490,6 +502,7 @@ func (f *filesystem) buildCpioImage(ctx android.ModuleContext, compressed bool) 
	f.buildFsverityMetadataFiles(ctx, builder, specs, rootDir, rebasedDir)

	f.buildEventLogtagsFile(ctx, builder, rebasedDir)

	f.buildAconfigFlagsFiles(ctx, builder, specs, rebasedDir)

	f.copyFilesToProductOut(ctx, builder, rebasedDir)



	output := android.PathForModuleOut(ctx, f.installFileName()).OutputPath

	cmd := builder.Command().