From 94610401541ba03fcc4e1be608ac76cfad22ea1e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 29 Aug 2016 13:41:32 -0700
Subject: [PATCH] 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
---
 cc/cc.go       | 3 +++
 cc/sanitize.go | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cc/cc.go b/cc/cc.go
index 801768d5e..274f4fd55 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -873,6 +873,9 @@ func (c *Module) InstallInData() bool {
 	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 8023933c1..de19b827b 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -353,9 +353,6 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
 			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())