diff options
| -rw-r--r-- | android/config.go | 6 | ||||
| -rw-r--r-- | golang/golang_test.go | 2 | ||||
| -rw-r--r-- | ui/build/build.go | 11 | ||||
| -rw-r--r-- | ui/build/kati.go | 12 |
4 files changed, 15 insertions, 16 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) diff --git a/ui/build/build.go b/ui/build/build.go index 110ee9518..1dc6dbd8b 100644 --- a/ui/build/build.go +++ b/ui/build/build.go @@ -87,6 +87,17 @@ func SetupOutDir(ctx Context, config Config) { // without changing the command line every time. Avoids rebuilds // when using ninja. writeValueIfChanged(ctx, config, config.SoongOutDir(), "build_number.txt", buildNumber) + + hostname, ok := config.environ.Get("BUILD_HOSTNAME") + if !ok { + var err error + hostname, err = os.Hostname() + if err != nil { + ctx.Println("Failed to read hostname:", err) + hostname = "unknown" + } + } + writeValueIfChanged(ctx, config, config.SoongOutDir(), "build_hostname.txt", hostname) } var combinedBuildNinjaTemplate = template.Must(template.New("combined").Parse(` diff --git a/ui/build/kati.go b/ui/build/kati.go index 4dfb7108b..acd52546f 100644 --- a/ui/build/kati.go +++ b/ui/build/kati.go @@ -200,18 +200,10 @@ func runKati(ctx Context, config Config, extraSuffix string, args []string, envF // fi cmd.Environment.Unset("SOONG_USE_PARTIAL_COMPILE") - hostname, ok := cmd.Environment.Get("BUILD_HOSTNAME") // Unset BUILD_HOSTNAME during kati run to avoid kati rerun, kati will use BUILD_HOSTNAME from a file. cmd.Environment.Unset("BUILD_HOSTNAME") - if !ok { - hostname, err = os.Hostname() - if err != nil { - ctx.Println("Failed to read hostname:", err) - hostname = "unknown" - } - } - writeValueIfChanged(ctx, config, config.SoongOutDir(), "build_hostname.txt", hostname) - _, ok = cmd.Environment.Get("BUILD_NUMBER") + + _, ok := cmd.Environment.Get("BUILD_NUMBER") // Unset BUILD_NUMBER during kati run to avoid kati rerun, kati will use BUILD_NUMBER from a file. cmd.Environment.Unset("BUILD_NUMBER") if ok { |