From e21fe426628f68a6dd5f4f56b0daba7ec7161d1d Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Wed, 1 Nov 2017 19:42:45 -0700 Subject: [PATCH] Don't install both variants for host or non-make builds. This CL ensures that only one of the two generated variants are installed for non-make builds and for host binaries. Bug: 30227045 Test: OUT_DIR=/tmp/ndk build/soong/scripts/build-ndk-prebuilts.sh Change-Id: I7ca78af51ea6bd3ae1107a69331abd6ff68f2150 --- cc/sanitize.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cc/sanitize.go b/cc/sanitize.go index 7d2b1ca17..9e1f02f7c 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -470,7 +470,6 @@ func (sanitize *sanitize) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMk ret.SubName += ".asan" } } - } func (sanitize *sanitize) inSanitizerDir() bool { @@ -582,12 +581,6 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) { modules[1].(*Module).sanitize.SetSanitizer(cfi, false) } } else { - if isSanitizerEnabled { - modules[0].(*Module).Properties.PreventInstall = true - } else { - modules[1].(*Module).Properties.PreventInstall = true - } - if mctx.AConfig().EmbeddedInMake() { if isSanitizerEnabled { modules[0].(*Module).Properties.HideFromMake = true @@ -596,6 +589,13 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) { } } } + if !mctx.AConfig().EmbeddedInMake() || !mctx.Device() { + if isSanitizerEnabled { + modules[0].(*Module).Properties.PreventInstall = true + } else { + modules[1].(*Module).Properties.PreventInstall = true + } + } } c.sanitize.Properties.SanitizeDep = false }