From f173d595c2773144a62442e32457324bc2f989ad Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 27 Apr 2017 14:28:00 -0700
Subject: Support ASAN for ckati and ninja

I missed this when converting to soong_ui.

Test: m -j blueprint_tools (check soong.log)
Test: SANITIZE_HOST=address m -j blueprint_tools
Change-Id: I01eb567db6848dc36dd679557291a4e600a63bba
---
 ui/build/config.go | 12 ++++++++++++
 ui/build/kati.go   |  2 +-
 ui/build/ninja.go  |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/build/config.go b/ui/build/config.go
index c01bf4c9..f5007b1b 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -318,3 +318,15 @@ func (c *configImpl) HostPrebuiltTag() string {
 		panic("Unsupported OS")
 	}
 }
+
+func (c *configImpl) PrebuiltBuildTool(name string) string {
+	if v, ok := c.environ.Get("SANITIZE_HOST"); ok {
+		if sanitize := strings.Fields(v); inList("address", sanitize) {
+			asan := filepath.Join("prebuilts/build-tools", c.HostPrebuiltTag(), "asan/bin", name)
+			if _, err := os.Stat(asan); err == nil {
+				return asan
+			}
+		}
+	}
+	return filepath.Join("prebuilts/build-tools", c.HostPrebuiltTag(), "bin", name)
+}
diff --git a/ui/build/kati.go b/ui/build/kati.go
index f9907675..218ca698 100644
--- a/ui/build/kati.go
+++ b/ui/build/kati.go
@@ -65,7 +65,7 @@ func runKati(ctx Context, config Config) {
 
 	genKatiSuffix(ctx, config)
 
-	executable := "prebuilts/build-tools/" + config.HostPrebuiltTag() + "/bin/ckati"
+	executable := config.PrebuiltBuildTool("ckati")
 	args := []string{
 		"--ninja",
 		"--ninja_dir=" + config.OutDir(),
diff --git a/ui/build/ninja.go b/ui/build/ninja.go
index 33f9a07b..054af243 100644
--- a/ui/build/ninja.go
+++ b/ui/build/ninja.go
@@ -26,7 +26,7 @@ func runNinja(ctx Context, config Config) {
 	ctx.BeginTrace("ninja")
 	defer ctx.EndTrace()
 
-	executable := "prebuilts/build-tools/" + config.HostPrebuiltTag() + "/bin/ninja"
+	executable := config.PrebuiltBuildTool("ninja")
 	args := []string{
 		"-d", "keepdepfile",
 	}
-- 
cgit v1.2.3