From 1d31ec3667d234172decc9a9bdf32dcc6652822a Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 22 Sep 2015 16:56:09 -0700 Subject: [PATCH] Add ProductVariables.DeviceName, set defaults to flounder Using flounder defaults to compare against make. Change-Id: I88fb0809e84b78ef005b76f255017a4d4a35fd13 --- common/config.go | 2 +- common/variable.go | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/config.go b/common/config.go index 1cd75d300..1340db85e 100644 --- a/common/config.go +++ b/common/config.go @@ -211,7 +211,7 @@ func (c *config) EnvDeps() map[string]string { // DeviceName returns the name of the current device target // TODO: take an AndroidModuleContext to select the device name for multi-device builds func (c *config) DeviceName() string { - return "unset" + return *c.ProductVariables.DeviceName } // DeviceOut returns the path to out directory for device targets diff --git a/common/variable.go b/common/variable.go index a395b41ba..61060e947 100644 --- a/common/variable.go +++ b/common/variable.go @@ -56,8 +56,9 @@ type productVariables struct { Device_uses_jemalloc *bool `json:",omitempty"` Device_uses_dlmalloc *bool `json:",omitempty"` Dlmalloc_alignment *int `json:",omitempty"` - Platform_sdk_version *int + Platform_sdk_version *int `json:",omitempty"` + DeviceName *string `json:",omitempty"` DeviceArch *string `json:",omitempty"` DeviceArchVariant *string `json:",omitempty"` DeviceCpuVariant *string `json:",omitempty"` @@ -86,16 +87,17 @@ func stringPtr(v string) *string { func (v *productVariables) SetDefaultConfig() { *v = productVariables{ - Device_uses_jemalloc: boolPtr(true), + Device_uses_dlmalloc: boolPtr(true), Platform_sdk_version: intPtr(22), HostArch: stringPtr("x86_64"), HostSecondaryArch: stringPtr("x86"), + DeviceName: stringPtr("flounder"), DeviceArch: stringPtr("arm64"), DeviceCpuVariant: stringPtr("denver64"), DeviceAbi: &[]string{"arm64-v8a"}, DeviceSecondaryArch: stringPtr("arm"), DeviceSecondaryArchVariant: stringPtr("armv7-a-neon"), - DeviceSecondaryCpuVariant: stringPtr("cortex-a15"), + DeviceSecondaryCpuVariant: stringPtr("denver"), DeviceSecondaryAbi: &[]string{"armeabi-v7a"}, } }