diff options
| author | Liz Prucka <lizprucka@google.com> | 2023-05-15 16:40:06 -0500 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2023-05-16 12:47:20 +0200 |
| commit | 60d220b5f0c5cbb5829756571dcc1c8eb4fd7033 (patch) | |
| tree | d5da896cce5e9db4966bf73b3523928b0570d4d5 /pkg/build | |
| parent | 71b00cfbfc5c749ff257952d9bd9e7cdbc7c654b (diff) | |
pkg/build: update .config path for Bazel Cuttlefish builds
Android13 build .config files for bazel are located in
'<tmp_build_dir>/virtual_device_x86_64_config/.config',
while Android14 bazel .build config files are located in
'<tmp_build_dir>/virtual_device_x86_64_config/out_dir/.config.'
Updating the path to account for both cases.
Diffstat (limited to 'pkg/build')
| -rw-r--r-- | pkg/build/cuttlefish.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/build/cuttlefish.go b/pkg/build/cuttlefish.go index 680bd331a..312da054b 100644 --- a/pkg/build/cuttlefish.go +++ b/pkg/build/cuttlefish.go @@ -99,7 +99,7 @@ func (c cuttlefish) build(params Params) (ImageDetails, error) { return details, fmt.Errorf("failed to build kernel: %s", err) } // Find the .config file; it is placed in a temporary output directory during the build. - cmd := osutil.Command("find", ".", "-wholename", "*virtual_device_x86_64_config/out_dir/.config") + cmd := osutil.Command("find", ".", "-regex", ".*virtual_device_x86_64_config.*/\\.config") cmd.Dir = params.KernelDir configBytes, err := osutil.Run(time.Minute, cmd) if err != nil { |