Fix installation path for asan libraries
Check c.sanitize.inData() when deciding on install paths.
Don't set inData() for sanitized binaries.
Bug: 30773053
Change-Id: I24be75ccc1b25ae53f7f0a98d1632b30735d0931
diff --git a/cc/cc.go b/cc/cc.go
index 801768d..274f4fd 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -873,6 +873,9 @@
if c.installer == nil {
return false
}
+ if c.sanitize != nil && c.sanitize.inData() {
+ return true
+ }
return c.installer.inData()
}
diff --git a/cc/sanitize.go b/cc/sanitize.go
index 8023933..de19b82 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -353,9 +353,6 @@
if c.isDependencyRoot() && c.sanitize.Sanitizer(t) {
modules := mctx.CreateVariations(t.String())
modules[0].(*Module).sanitize.SetSanitizer(t, true)
- if mctx.AConfig().EmbeddedInMake() && !c.Host() {
- modules[0].(*Module).sanitize.Properties.InData = true
- }
} else if c.sanitize.Properties.SanitizeDep {
if c.Host() {
modules := mctx.CreateVariations(t.String())