From 3f71bc7084a1415131fdf0b4e54c9376b383ae3e Mon Sep 17 00:00:00 2001 From: Quallenauge Date: Wed, 21 Oct 2020 21:19:01 +0200 Subject: [PATCH] Add ability to enable scudo-free 32-bit libc variant. The default value is set to enable scudo with the 32-bit libc variant. Change-Id: I9205da12eceadfe6245763a49c7208d30b82ad99 --- android/variable.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/android/variable.go b/android/variable.go index 60a2a3488..c03d178af 100644 --- a/android/variable.go +++ b/android/variable.go @@ -81,6 +81,16 @@ type variableProperties struct { Header_libs []string `android:"arch_variant"` } `android:"arch_variant"` + Malloc_low_memory_libc32 struct { + Cflags []string `android:"arch_variant"` + Shared_libs []string `android:"arch_variant"` + Whole_static_libs []string `android:"arch_variant"` + Static_libs []string `android:"arch_variant"` + Exclude_static_libs []string `android:"arch_variant"` + Srcs []string `android:"arch_variant"` + Header_libs []string `android:"arch_variant"` + } `android:"arch_variant"` + Malloc_zero_contents struct { Cflags []string `android:"arch_variant"` } `android:"arch_variant"` @@ -290,6 +300,7 @@ type ProductVariables struct { Always_use_prebuilt_sdks *bool `json:",omitempty"` Skip_boot_jars_check *bool `json:",omitempty"` Malloc_low_memory *bool `json:",omitempty"` + Malloc_low_memory_libc32 *bool `json:",omitempty"` Malloc_zero_contents *bool `json:",omitempty"` Malloc_pattern_fill_contents *bool `json:",omitempty"` Safestack *bool `json:",omitempty"` @@ -630,6 +641,7 @@ func (v *ProductVariables) SetDefaultConfig() { AAPTPrebuiltDPI: []string{"xhdpi", "xxhdpi"}, Malloc_low_memory: boolPtr(false), + Malloc_low_memory_libc32: boolPtr(false), Malloc_zero_contents: boolPtr(true), Malloc_pattern_fill_contents: boolPtr(false), Safestack: boolPtr(false),