diff options
| author | Laura Peskin <pesk@google.com> | 2024-12-09 12:07:43 -0800 |
|---|---|---|
| committer | glpesk <114444708+glpesk@users.noreply.github.com> | 2024-12-09 23:38:11 +0000 |
| commit | e4d2aef70c48cbcb4173a30dafbb51e6878c8b8e (patch) | |
| tree | e0ad6a3d12729439f766935aa3859498759eb08b | |
| parent | deb728774249ce479316c219f77530e2af52e3bd (diff) | |
pkg/build: use relative path for fx set directory arg
| -rw-r--r-- | pkg/build/starnix.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/build/starnix.go b/pkg/build/starnix.go index 1ab542929..712bc5b4c 100644 --- a/pkg/build/starnix.go +++ b/pkg/build/starnix.go @@ -59,11 +59,11 @@ func (st starnix) build(params Params) (ImageDetails, error) { if err := osutil.SandboxChown(localDir); err != nil { return ImageDetails{}, err } - buildDir := filepath.Join(params.KernelDir, "out/"+arch) + buildSubdir := "out/" + arch if _, err := runSandboxed( time.Hour, params.KernelDir, - "scripts/fx", "--dir", buildDir, + "scripts/fx", "--dir", buildSubdir, "set", product, "--assembly-override", fmt.Sprintf("//products/workbench/*=//local:%s", overrideName), ); err != nil { @@ -82,7 +82,7 @@ func (st starnix) build(params Params) (ImageDetails, error) { params.KernelDir, ffxBinary, "--no-environment", - "-c", filepath.Join(buildDir, ffxBuildConfig), + "-c", filepath.Join(params.KernelDir, buildSubdir, ffxBuildConfig), "-c", "log.enabled=false,ffx.analytics.disabled=true,daemon.autostart=false", "config", "get", "product.path", ) |