From 090d9df206512a44f86df8f95767a0bd48b84be5 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 11 Dec 2018 02:47:16 +0900 Subject: [PATCH] Disable cfi and stl for stubs libraries Stubs libs are not built with dependencies required for cfi and stl. Also it does not make much sense to build stubs with cfi and stl because the libs are not for runtime and there is no C++ symbols. Test: cherry-pick ag/5747464 and m Change-Id: I83d6d82513a77a6a8a345e7d12707940c2c906c7 --- cc/library.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cc/library.go b/cc/library.go index 2257e2ddc..2fd423b6b 100644 --- a/cc/library.go +++ b/cc/library.go @@ -1053,6 +1053,8 @@ func VersionMutator(mctx android.BottomUpMutatorContext) { l.MutatedProperties.BuildStubs = true l.MutatedProperties.StubsVersion = versions[i] m.(*Module).Properties.HideFromMake = true + m.(*Module).sanitize = nil + m.(*Module).stl = nil } } } else {