diff options
| author | 2025-01-06 16:29:47 -0800 | |
|---|---|---|
| committer | 2025-01-06 16:47:44 -0800 | |
| commit | 2e40ad9fc63204d159c6e5aeb74649e981602a0e (patch) | |
| tree | 276b8a1b842020da1490d83745da65f3b576e840 | |
| parent | e14082c31a16799e94bf70bbb30bc1a19a83eba0 (diff) | |
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
| -rw-r--r-- | android/config.go | 6 | ||||
| -rw-r--r-- | golang/golang_test.go | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/android/config.go b/android/config.go index 00d5e2c6a..e9cb2cd31 100644 --- a/android/config.go +++ b/android/config.go @@ -768,11 +768,7 @@ func (c *config) SetAllowMissingDependencies() { // BlueprintToolLocation returns the directory containing build system tools // from Blueprint, like soong_zip and merge_zips. func (c *config) HostToolDir() string { - if c.KatiEnabled() { - return filepath.Join(c.outDir, "host", c.PrebuiltOS(), "bin") - } else { - return filepath.Join(c.soongOutDir, "host", c.PrebuiltOS(), "bin") - } + return filepath.Join(c.outDir, "host", c.PrebuiltOS(), "bin") } func (c *config) HostToolPath(ctx PathContext, tool string) Path { 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) |