diff options
| author | Florent Revest <revest@chromium.org> | 2024-10-02 16:02:12 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-10-14 19:43:42 +0000 |
| commit | 484e362fcff09b8b74162eefd0c3bfd67e829d94 (patch) | |
| tree | 7db4c1f87a6c37073084a6b806978495297f6d25 /pkg/build/android.go | |
| parent | 2e5c6a5c1c62461b69c6f50a123885b9910fce04 (diff) | |
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.
Diffstat (limited to 'pkg/build/android.go')
| -rw-r--r-- | pkg/build/android.go | 6 |
1 files changed, 3 insertions, 3 deletions
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 |