Merge "Don't use sanitized kati when SANITIZE_HOST=address is set" into main (6002288a) · Commits · e / os / android_build_soong

ui/build/config.go

+4 −6

Original line number	Diff line number	Diff line
		@@ -1754,14 +1754,12 @@ func (c *configImpl) SisoBin() string {
		}

		func (c *configImpl) PrebuiltBuildTool(name string) string {
		if v, ok := c.environ.Get("SANITIZE_HOST"); ok {
		if sanitize := strings.Fields(v); inList("address", sanitize) {
		if c.environ.IsEnvTrue("SANITIZE_BUILD_TOOL_PREBUILTS") {
		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)
		}