aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-02-03 23:16:33 -0800
committerDan Willemsen <dwillemsen@google.com>2016-02-08 16:07:22 -0800
commit07cd051a176589fda0ad6a5a2fa6793960c50fbb (patch)
treed0e65b300ae28ebc3fe049671ae85ce3ac7af926 /common
parent7f730fd0ad2e3e7e33dbb3f2b63889d7dab98edf (diff)
downloadbuild_soong-07cd051a176589fda0ad6a5a2fa6793960c50fbb.tar.gz
build_soong-07cd051a176589fda0ad6a5a2fa6793960c50fbb.tar.bz2
build_soong-07cd051a176589fda0ad6a5a2fa6793960c50fbb.zip
Add windows x86_64
Bug: 26957718 Change-Id: I5cfa2f44c27eac0805d21865c45546ed3c2c2103
Diffstat (limited to 'common')
-rw-r--r--common/arch.go2
-rw-r--r--common/variable.go1
2 files changed, 3 insertions, 0 deletions
diff --git a/common/arch.go b/common/arch.go
index 08c570e7..ee1cfae6 100644
--- a/common/arch.go
+++ b/common/arch.go
@@ -264,6 +264,8 @@ type archProperties struct {
Windows interface{} `blueprint:"filter(android:\"arch_variant\")"`
// Properties for module variants being built to run on windows x86 hosts
Windows_x86 interface{} `blueprint:"filter(android:\"arch_variant\")"`
+ // Properties for module variants being built to run on windows x86_64 hosts
+ Windows_x86_64 interface{} `blueprint:"filter(android:\"arch_variant\")"`
// Properties for module variants being built to run on linux or darwin hosts
Not_windows interface{} `blueprint:"filter(android:\"arch_variant\")"`
}
diff --git a/common/variable.go b/common/variable.go
index c899bb41..e9f59151 100644
--- a/common/variable.go
+++ b/common/variable.go
@@ -117,6 +117,7 @@ func (v *productVariables) SetDefaultConfig() {
if runtime.GOOS == "linux" {
v.CrossHost = stringPtr("windows")
v.CrossHostArch = stringPtr("x86")
+ v.CrossHostSecondaryArch = stringPtr("x86_64")
}
}