aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2021-12-08 23:38:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-08 23:38:45 +0000
commit066d58e41c584ec058419eae3cde8fea8904a611 (patch)
tree23b999ac5c78b7fc8bc2caaaf97f566e90e7560a
parent1308e8322139f8aeb51170613e9c2408704a5b37 (diff)
parent20e31dab320c18044b2470a00d83d0d3c1846fab (diff)
downloadllvm-066d58e41c584ec058419eae3cde8fea8904a611.tar.gz
Merge "Build darwin_arm64 from source" am: 21204cd2c8 am: 7d0af1d166 am: 20e31dab32
Original change: https://android-review.googlesource.com/c/platform/external/llvm/+/1885368 Change-Id: I1cfa60cea6d2f81c18b1cf58eff8c9bff512ec20
-rw-r--r--soong/llvm.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/soong/llvm.go b/soong/llvm.go
index edbc9cb95d5c..6a38fb56aec8 100644
--- a/soong/llvm.go
+++ b/soong/llvm.go
@@ -89,6 +89,9 @@ func forceBuildLlvmComponents(ctx android.LoadHookContext) {
if !forceBuild {
type props struct {
Target struct {
+ Darwin_arm64 struct {
+ Enabled *bool
+ }
Host struct {
Enabled *bool
}
@@ -98,6 +101,7 @@ func forceBuildLlvmComponents(ctx android.LoadHookContext) {
}
}
p := &props{}
+ p.Target.Darwin_arm64.Enabled = proptools.BoolPtr(true)
p.Target.Host.Enabled = proptools.BoolPtr(false)
p.Target.Linux_bionic_arm64.Enabled = proptools.BoolPtr(true)
ctx.AppendProperties(p)