From 2e40ad9fc63204d159c6e5aeb74649e981602a0e Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 6 Jan 2025 16:29:47 -0800 Subject: Always use out/host for host tools Previously, files were installed to out/host or out/soong/host based on if kati was used or not. That was changed in aosp/3418304, but this HostToolDir() that's used by blueprint was not updated to match that change, so soong-only builds were failing with missing host tools. Bug: 388038396 Test: m --soong-only dist, ./prebuilts/build-tools/build-prebuilts.sh Change-Id: Ib104a6399ce2308d81651ec620323caaf9c76151 --- golang/golang_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'golang/golang_test.go') diff --git a/golang/golang_test.go b/golang/golang_test.go index 0a4baedb4..d555d144c 100644 --- a/golang/golang_test.go +++ b/golang/golang_test.go @@ -47,7 +47,7 @@ func TestGolang(t *testing.T) { bin := result.ModuleForTests("gobin", result.Config.BuildOSTarget.String()) - expected := "^out/soong/host/" + result.Config.PrebuiltOS() + "/bin/go/gobin/?[^/]*/obj/gobin$" + expected := "^out/host/" + result.Config.PrebuiltOS() + "/bin/go/gobin/?[^/]*/obj/gobin$" actual := android.PathsRelativeToTop(bin.OutputFiles(result.TestContext, t, "")) if len(actual) != 1 { t.Fatalf("Expected 1 output file, got %v", actual) -- cgit v1.2.3-59-g8ed1b