Snap for 7986305 from 505fc6000e199644bf7d3f2df4887b1b8272134f to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi

Change-Id: Ifc11cd9005f131ad5b75fb116dd5383db52f3c6c

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)