diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-03-04 23:53:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-04 23:53:36 +0000 |
| commit | f3af6ce6314a3d32b3b563806a6f990b1af9772a (patch) | |
| tree | 5e7c59486e70d32050c39b91e2e92446b4248fa9 | |
| parent | b955336d33c1bca8c3a79bf716ca873540cd9a7b (diff) | |
| parent | 97cae01e92262ebdc601cf639a8b9d406866a6c1 (diff) | |
| download | build_soong-android-n-preview-1.tar.gz build_soong-android-n-preview-1.tar.bz2 build_soong-android-n-preview-1.zip | |
Merge "Replace Device_uses_{dl,je}malloc with Malloc_not_svelte"android-n-preview-1
| -rw-r--r-- | common/variable.go | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/common/variable.go b/common/variable.go index e9f59151..04856e1a 100644 --- a/common/variable.go +++ b/common/variable.go @@ -29,16 +29,6 @@ func init() { type variableProperties struct { Product_variables struct { - Device_uses_dlmalloc struct { - Cflags []string - Srcs []string - } - Device_uses_jemalloc struct { - Cflags []string - Srcs []string - Whole_static_libs []string - Include_dirs []string - } Platform_sdk_version struct { Asflags []string } @@ -52,15 +42,17 @@ type variableProperties struct { Brillo struct { Version_script *string `android:"arch_variant"` } `android:"arch_variant"` + + Malloc_not_svelte struct { + Cflags []string + } } `android:"arch_variant"` } var zeroProductVariables variableProperties type productVariables struct { - Device_uses_jemalloc *bool `json:",omitempty"` - Device_uses_dlmalloc *bool `json:",omitempty"` - Platform_sdk_version *int `json:",omitempty"` + Platform_sdk_version *int `json:",omitempty"` DeviceName *string `json:",omitempty"` DeviceArch *string `json:",omitempty"` @@ -81,8 +73,9 @@ type productVariables struct { CrossHostArch *string `json:",omitempty"` CrossHostSecondaryArch *string `json:",omitempty"` - Unbundled_build *bool `json:",omitempty"` - Brillo *bool `json:",omitempty"` + Unbundled_build *bool `json:",omitempty"` + Brillo *bool `json:",omitempty"` + Malloc_not_svelte *bool `json:",omitempty"` } func boolPtr(v bool) *bool { @@ -99,7 +92,6 @@ func stringPtr(v string) *string { func (v *productVariables) SetDefaultConfig() { *v = productVariables{ - Device_uses_dlmalloc: boolPtr(true), Platform_sdk_version: intPtr(22), HostArch: stringPtr("x86_64"), HostSecondaryArch: stringPtr("x86"), @@ -112,6 +104,7 @@ func (v *productVariables) SetDefaultConfig() { DeviceSecondaryArchVariant: stringPtr("armv7-a-neon"), DeviceSecondaryCpuVariant: stringPtr("denver"), DeviceSecondaryAbi: &[]string{"armeabi-v7a"}, + Malloc_not_svelte: boolPtr(false), } if runtime.GOOS == "linux" { |