StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add ProductVariables.DeviceName, set defaults to flounder"

Browse Source
This commit is contained in:
Dan Willemsen
2015-09-24 20:00:59 +00:00
committed by Gerrit Code Review
parent 1e898b9e04 1d31ec3667
commit 83285cec5f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/config.go
View File

@@ -211,7 +211,7 @@ func (c *config) EnvDeps() map[string]string {
// DeviceName returns the name of the current device target // DeviceName returns the name of the current device target
// TODO: take an AndroidModuleContext to select the device name for multi-device builds // TODO: take an AndroidModuleContext to select the device name for multi-device builds
func (c *config) DeviceName() string { func (c *config) DeviceName() string {
return "unset" return *c.ProductVariables.DeviceName
} }
// DeviceOut returns the path to out directory for device targets // DeviceOut returns the path to out directory for device targets

8
common/variable.go
View File

@@ -56,8 +56,9 @@ type productVariables struct {
Device_uses_jemalloc *bool `json:",omitempty"` Device_uses_jemalloc *bool `json:",omitempty"`
Device_uses_dlmalloc *bool `json:",omitempty"` Device_uses_dlmalloc *bool `json:",omitempty"`
Dlmalloc_alignment *int `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"` DeviceArch *string `json:",omitempty"`
DeviceArchVariant *string `json:",omitempty"` DeviceArchVariant *string `json:",omitempty"`
DeviceCpuVariant *string `json:",omitempty"` DeviceCpuVariant *string `json:",omitempty"`
@@ -86,16 +87,17 @@ func stringPtr(v string) *string {
func (v *productVariables) SetDefaultConfig() { func (v *productVariables) SetDefaultConfig() {
*v = productVariables{ *v = productVariables{
Device_uses_jemalloc: boolPtr(true), Device_uses_dlmalloc: boolPtr(true),
Platform_sdk_version: intPtr(22), Platform_sdk_version: intPtr(22),
HostArch: stringPtr("x86_64"), HostArch: stringPtr("x86_64"),
HostSecondaryArch: stringPtr("x86"), HostSecondaryArch: stringPtr("x86"),
DeviceName: stringPtr("flounder"),
DeviceArch: stringPtr("arm64"), DeviceArch: stringPtr("arm64"),
DeviceCpuVariant: stringPtr("denver64"), DeviceCpuVariant: stringPtr("denver64"),
DeviceAbi: &[]string{"arm64-v8a"}, DeviceAbi: &[]string{"arm64-v8a"},
DeviceSecondaryArch: stringPtr("arm"), DeviceSecondaryArch: stringPtr("arm"),
DeviceSecondaryArchVariant: stringPtr("armv7-a-neon"), DeviceSecondaryArchVariant: stringPtr("armv7-a-neon"),
DeviceSecondaryCpuVariant: stringPtr("cortex-a15"), DeviceSecondaryCpuVariant: stringPtr("denver"),
DeviceSecondaryAbi: &[]string{"armeabi-v7a"}, DeviceSecondaryAbi: &[]string{"armeabi-v7a"},
} }
} }