Set host and device arches from product variables
Read the host and device arches from soong.variables.
Bug: 23567214
Change-Id: Ie44db4dcf431a4c7dddcdc26117d4daa734c1f67
diff --git a/common/variable.go b/common/variable.go
index bf7b594..5116a95 100644
--- a/common/variable.go
+++ b/common/variable.go
@@ -57,6 +57,19 @@
Device_uses_dlmalloc *bool `json:",omitempty"`
Dlmalloc_alignment *int `json:",omitempty"`
Platform_sdk_version *int
+
+ DeviceArch *string `json:",omitempty"`
+ DeviceArchVariant *string `json:",omitempty"`
+ DeviceCpuVariant *string `json:",omitempty"`
+ DeviceAbi *[]string `json:",omitempty"`
+
+ DeviceSecondaryArch *string `json:",omitempty"`
+ DeviceSecondaryArchVariant *string `json:",omitempty"`
+ DeviceSecondaryCpuVariant *string `json:",omitempty"`
+ DeviceSecondaryAbi *[]string `json:",omitempty"`
+
+ HostArch *string `json:",omitempty"`
+ HostSecondaryArch *string `json:",omitempty"`
}
func boolPtr(v bool) *bool {
@@ -67,10 +80,23 @@
return &v
}
+func stringPtr(v string) *string {
+ return &v
+}
+
func (productVariables) DefaultConfig() jsonConfigurable {
v := productVariables{
- Device_uses_jemalloc: boolPtr(true),
- Platform_sdk_version: intPtr(22),
+ Device_uses_jemalloc: boolPtr(true),
+ Platform_sdk_version: intPtr(22),
+ HostArch: stringPtr("x86_64"),
+ HostSecondaryArch: stringPtr("x86"),
+ DeviceArch: stringPtr("arm64"),
+ DeviceCpuVariant: stringPtr("denver64"),
+ DeviceAbi: &[]string{"arm64-v8a"},
+ DeviceSecondaryArch: stringPtr("arm"),
+ DeviceSecondaryArchVariant: stringPtr("armv7-a-neon"),
+ DeviceSecondaryCpuVariant: stringPtr("cortex-a15"),
+ DeviceSecondaryAbi: &[]string{"armeabi-v7a"},
}
return v
}