From 9e0870033f919dda208b44aa5b7ec596ced99504 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Wed, 8 Jan 2025 19:12:23 +0000 Subject: Copy partition image files to PRODUCT_OUT Implementation details: - Copy the partition image files to PRODUCT_OUT via rsync Test: m aosp_cf_x86_64_phone_generated_device Bug: 376727180 Change-Id: I21c9ddc22def5a48a885176b53b886326d7c9243 --- filesystem/filesystem.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 6dfbfd1be..4027b9a79 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -600,6 +600,11 @@ func (f *filesystem) copyFilesToProductOut(ctx android.ModuleContext, builder *a builder.Command().Textf("cp -prf %s/* %s", rebasedDir, installPath) } +func copyImageFileToProductOut(ctx android.ModuleContext, builder *android.RuleBuilder, partition string, output android.Path) { + copyDir := android.PathForModuleInPartitionInstall(ctx, "").Join(ctx, fmt.Sprintf("%s.img", partition)) + builder.Command().Textf("rsync -a %s %s", output, copyDir) +} + func (f *filesystem) rootDirString() string { return f.partitionName() } @@ -651,6 +656,10 @@ func (f *filesystem) buildImageUsingBuildImage(ctx android.ModuleContext) (andro Output(output). Text(rootDir.String()) // directory where to find fs_config_files|dirs + if !ctx.Config().KatiEnabled() { + copyImageFileToProductOut(ctx, builder, f.partitionName(), output) + } + // rootDir is not deleted. Might be useful for quick inspection. builder.Build("build_filesystem_image", fmt.Sprintf("Creating filesystem %s", f.BaseModuleName())) -- cgit v1.2.3-59-g8ed1b