From 11fda3358e506727e649bc3a671bd82da15634d0 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 14 Jan 2025 16:47:19 -0800 Subject: Rewrite code to copy images to PRODUCT_OUT Move the logic to android_device. The reasons for this are: - As we start to check in android_device and filesystem modules, only one set should do the copying. It's easy enough to mark the android_device as the one, but harder for the filesystem modules given that they may be reused between different devices and now that top-down mutators are no longer supported. - It's easier to manage this code in one place, especially since it's temporary and should be removed eventually. Having this higher confidence that there's only 1 copy rule set in the build makes it less of a problem to use actual ninja rules for the images. Bug: 376727180 Test: m --soong-only && ls out/target/product/vsoc_x86_64/ Change-Id: If20ea2c55053cc962de9f9770db002edbc194835 --- filesystem/vbmeta.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'filesystem/vbmeta.go') diff --git a/filesystem/vbmeta.go b/filesystem/vbmeta.go index d468186f0..fb766875d 100644 --- a/filesystem/vbmeta.go +++ b/filesystem/vbmeta.go @@ -284,10 +284,6 @@ func (v *vbmeta) GenerateAndroidBuildActions(ctx android.ModuleContext) { FlagWithArg("-s ", strconv.Itoa(vbmetaMaxSize)). Output(output) - if !ctx.Config().KatiEnabled() { - copyImageFileToProductOut(ctx, builder, v.partitionName(), output) - } - builder.Build("vbmeta", fmt.Sprintf("vbmeta %s", ctx.ModuleName())) v.installDir = android.PathForModuleInstall(ctx, "etc") -- cgit v1.2.3-59-g8ed1b