summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuallenauge <Hamsi2k@freenet.de>2020-10-21 21:19:01 +0200
committerMichael Bestas <mkbestas@lineageos.org>2020-12-08 22:28:30 +0200
commit0e0bfb7eac3faafb81709bde885589bc7156a1bc (patch)
tree4b736613a336940fc5ac9774d6326f07bb14f200
parent60ece2daa5197f376198966cc7e1aadc94e53436 (diff)
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
-rw-r--r--android/variable.go13
1 files changed, 11 insertions, 2 deletions
diff --git a/android/variable.go b/android/variable.go
index a4bd6b09b..4cf2d27fb 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -49,6 +49,13 @@ type variableProperties struct {
Exclude_static_libs []string `android:"arch_variant"`
} `android:"arch_variant"`
+ Malloc_not_svelte_libc32 struct {
+ Cflags []string `android:"arch_variant"`
+ Shared_libs []string `android:"arch_variant"`
+ Whole_static_libs []string `android:"arch_variant"`
+ Exclude_static_libs []string `android:"arch_variant"`
+ } `android:"arch_variant"`
+
Safestack struct {
Cflags []string `android:"arch_variant"`
} `android:"arch_variant"`
@@ -207,6 +214,7 @@ type productVariables struct {
Unbundled_build *bool `json:",omitempty"`
Unbundled_build_sdks_from_source *bool `json:",omitempty"`
Malloc_not_svelte *bool `json:",omitempty"`
+ Malloc_not_svelte_libc32 *bool `json:",omitempty"`
Safestack *bool `json:",omitempty"`
HostStaticBinaries *bool `json:",omitempty"`
Binder32bit *bool `json:",omitempty"`
@@ -380,8 +388,9 @@ func (v *productVariables) SetDefaultConfig() {
AAPTCharacteristics: stringPtr("nosdcard"),
AAPTPrebuiltDPI: []string{"xhdpi", "xxhdpi"},
- Malloc_not_svelte: boolPtr(true),
- Safestack: boolPtr(false),
+ Malloc_not_svelte: boolPtr(true),
+ Malloc_not_svelte_libc32: boolPtr(true),
+ Safestack: boolPtr(false),
}
if runtime.GOOS == "linux" {