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 --- android/config.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'android') 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 { -- cgit v1.2.3-59-g8ed1b