From 484e362fcff09b8b74162eefd0c3bfd67e829d94 Mon Sep 17 00:00:00 2001 From: Florent Revest Date: Wed, 2 Oct 2024 16:02:12 +0200 Subject: pkg/build: use the build environment in clean() calls This unifies the build() and clean() interfaces such that if a custom compiler or make binary is provided in the manager or bisection config, they can be taken into account by the clean() interface. --- pkg/build/android.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/build/android.go') diff --git a/pkg/build/android.go b/pkg/build/android.go index be6301be0..e5f19a451 100644 --- a/pkg/build/android.go +++ b/pkg/build/android.go @@ -179,11 +179,11 @@ func (a android) embedImages(w io.Writer, srcDir string, imageNames ...string) e return nil } -func (a android) clean(kernelDir, targetArch string) error { - if err := osutil.RemoveAll(filepath.Join(kernelDir, "out")); err != nil { +func (a android) clean(params Params) error { + if err := osutil.RemoveAll(filepath.Join(params.KernelDir, "out")); err != nil { return fmt.Errorf("failed to clean 'out' directory: %w", err) } - if err := osutil.RemoveAll(filepath.Join(kernelDir, "dist")); err != nil { + if err := osutil.RemoveAll(filepath.Join(params.KernelDir, "dist")); err != nil { return fmt.Errorf("failed to clean 'dist' directory: %w", err) } return nil -- cgit mrf-deployment