From 60d220b5f0c5cbb5829756571dcc1c8eb4fd7033 Mon Sep 17 00:00:00 2001 From: Liz Prucka Date: Mon, 15 May 2023 16:40:06 -0500 Subject: pkg/build: update .config path for Bazel Cuttlefish builds Android13 build .config files for bazel are located in '/virtual_device_x86_64_config/.config', while Android14 bazel .build config files are located in '/virtual_device_x86_64_config/out_dir/.config.' Updating the path to account for both cases. --- pkg/build/cuttlefish.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/build/cuttlefish.go') 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 { -- cgit mrf-deployment