aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-17 01:03:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-17 01:03:21 +0000
commit1d0eff3aae8f571307c2f877d9d0f26328bf3144 (patch)
treed610927670f4b47103ee19f9958ae041b814e6bd
parent7672c2aaef149cfed0286cc5f2fce963b0e9e344 (diff)
parentb0123fa28050e271a2bd3b9a5d715a6b23353328 (diff)
downloadllvm-1d0eff3aae8f571307c2f877d9d0f26328bf3144.tar.gz
Merge "linux_bionic_arm64 is always built from source" am: d48ce92368 am: b0123fa280
Original change: https://android-review.googlesource.com/c/platform/external/llvm/+/1409867 Change-Id: Ib7245945c242d45cbc42fd1d672a15a3c9d54070
-rw-r--r--soong/llvm.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/soong/llvm.go b/soong/llvm.go
index d1573bc454c3..edbc9cb95d5c 100644
--- a/soong/llvm.go
+++ b/soong/llvm.go
@@ -92,10 +92,14 @@ func forceBuildLlvmComponents(ctx android.LoadHookContext) {
Host struct {
Enabled *bool
}
+ Linux_bionic_arm64 struct {
+ Enabled *bool
+ }
}
}
p := &props{}
p.Target.Host.Enabled = proptools.BoolPtr(false)
+ p.Target.Linux_bionic_arm64.Enabled = proptools.BoolPtr(true)
ctx.AppendProperties(p)
}
}