Use correct variant for annotation processors. am: 878c662602 am: f739144c43
am: aaf8742b38
Change-Id: I96d6b574dfaa8953f79e7f778050b4ef39681656
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index f412583..172784a 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -174,6 +174,7 @@
toolchain64Bit
ldflags string
+ lldflags string
toolchainCflags string
toolchainClangCflags string
}
@@ -231,7 +232,7 @@
}
func (t *toolchainArm64) ClangLldflags() string {
- return "${config.Arm64Lldflags}"
+ return t.lldflags
}
func (t *toolchainArm64) ToolchainClangCflags() string {
@@ -269,6 +270,10 @@
"${config.Arm64Ldflags}",
extraLdflags,
}, " "),
+ lldflags: strings.Join([]string{
+ "${config.Arm64Lldflags}",
+ extraLdflags,
+ }, " "),
toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant),
toolchainClangCflags: strings.Join(toolchainClangCflags, " "),
}