Merge "Build LLVM/clang libs during SANITIZE_HOST build"
diff --git a/soong/llvm.go b/soong/llvm.go
index bc48f2a..9c3d20c 100644
--- a/soong/llvm.go
+++ b/soong/llvm.go
@@ -78,7 +78,15 @@
}
func forceBuildLlvmComponents(ctx android.LoadHookContext) {
- if !ctx.AConfig().IsEnvTrue("FORCE_BUILD_LLVM_COMPONENTS") {
+ forceBuild := false
+ if ctx.AConfig().IsEnvTrue("FORCE_BUILD_LLVM_COMPONENTS") {
+ forceBuild = true
+ }
+ if len(ctx.AConfig().SanitizeHost()) > 0 {
+ forceBuild = true
+ }
+
+ if !forceBuild {
type props struct {
Target struct {
Host struct {
