pkg/build/cuttlefish: copy module objects

Copy Cuttlefish module objects to be used
in coverage report generation.

2 files changed, 5 insertions, 2 deletions

diff --git a/pkg/build/android.go b/pkg/build/android.go
index efbf385f9..be6301be0 100644
--- a/pkg/build/android.go
+++ b/pkg/build/android.go
@@ -107,7 +107,7 @@ func (a android) build(params Params) (ImageDetails, error) {
 	}
 	defer imageFile.Close()
 
-	if err := a.copyModuleFiles(filepath.Join(params.KernelDir, "out"), params.OutputDir); err != nil {
+	if err := copyModuleFiles(filepath.Join(params.KernelDir, "out"), params.OutputDir); err != nil {
 		return details, fmt.Errorf("failed copying module files: %w", err)
 	}
 
@@ -124,7 +124,7 @@ func (a android) build(params Params) (ImageDetails, error) {
 	return details, nil
 }
 
-func (a android) copyModuleFiles(srcDir, dstDir string) error {
+func copyModuleFiles(srcDir, dstDir string) error {
 	err := filepath.Walk(srcDir,
 		func(path string, info os.FileInfo, err error) error {
 			if err != nil {
diff --git a/pkg/build/cuttlefish.go b/pkg/build/cuttlefish.go
index 196090c1b..bf345c2bc 100644
--- a/pkg/build/cuttlefish.go
+++ b/pkg/build/cuttlefish.go
@@ -153,6 +153,9 @@ func (c cuttlefish) build(params Params) (ImageDetails, error) {
 	if err := osutil.CopyFile(config, filepath.Join(params.OutputDir, "kernel.config")); err != nil {
 		return details, err
 	}
+	if err := copyModuleFiles(filepath.Join(params.KernelDir, "out"), params.OutputDir); err != nil {
+		return details, err
+	}
 
 	details.Signature, err = elfBinarySignature(vmlinux, params.Tracer)
 	if err != nil {