commit 82ad8ccca20631a7045b63fb9f235d49e37debf7
author Liz Kammer <eakammer@google.com> Mon Aug 02 10:41:48 2021 -0400
committer Liz Kammer <eakammer@google.com> Mon Aug 02 14:54:10 2021 -0400
tree 6dd8cdc30d36a4d7cf6d8bc1e166ba81e5a2d0f8
parent 93f51a3cff77664652fd68181304368da8e4b44c

Support exporting device arch toolchain info

Test: bp2build.sh
Bug: 187084665
Change-Id: I49e75f603accab519784dbaf25d85db0010587a3

cc/config/arm_device.go

diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go
index b5afe40..0fe5e68 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -188,6 +188,9 @@
 	exportStringListStaticVariable("ArmArmCflags", armArmCflags)
 	exportStringListStaticVariable("ArmThumbCflags", armThumbCflags)
 
+	exportedStringListDictVars.Set("ArmArchVariantCflags", armArchVariantCflags)
+	exportedStringListDictVars.Set("ArmCpuVariantCflags", armCpuVariantCflags)
+
 	// Clang arch variant cflags
 	exportStringListStaticVariable("ArmArmv7ACflags", armArchVariantCflags["armv7-a"])
 	exportStringListStaticVariable("ArmArmv7ANeonCflags", armArchVariantCflags["armv7-a-neon"])