Revert "build: soong: use jemalloc by default and allow opt-in to scu…

…do (2/4)" This reverts commit d13b5bc.
answer35 · Sep 9, 2024 · d25276d · d25276d
1 parent 6c2264a
commit d25276d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/android/config.go b/android/config.go
@@ -1137,7 +1137,7 @@ func (c *config) EnableCFI() bool {
 }
 
 func (c *config) DisableScudo() bool {
-	return !Bool(c.productVariables.Malloc_use_scudo)
+	return Bool(c.productVariables.DisableScudo)
 }
 
 func (c *config) Android64() bool {

diff --git a/android/variable.go b/android/variable.go
@@ -69,7 +69,7 @@ type variableProperties struct {
 			Enabled *bool `android:"arch_variant"`
 		} `android:"arch_variant"`
 
-		Malloc_use_scudo struct {
+		Malloc_not_svelte struct {
 			Cflags              []string `android:"arch_variant"`
 			Shared_libs         []string `android:"arch_variant"`
 			Whole_static_libs   []string `android:"arch_variant"`
@@ -79,14 +79,6 @@ type variableProperties struct {
 			Header_libs         []string `android:"arch_variant"`
 		} `android:"arch_variant"`
 
-		Malloc_not_svelte 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"`
-			Header_libs         []string `android:"arch_variant"`
-		} `android:"arch_variant"`
-
 		Malloc_not_svelte_libc32 struct {
 			Cflags              []string `android:"arch_variant"`
 			Shared_libs         []string `android:"arch_variant"`
@@ -293,7 +285,6 @@ type ProductVariables struct {
 	Unbundled_build_image        *bool    `json:",omitempty"`
 	Always_use_prebuilt_sdks     *bool    `json:",omitempty"`
 	Skip_boot_jars_check         *bool    `json:",omitempty"`
-	Malloc_use_scudo             *bool    `json:",omitempty"`
 	Malloc_not_svelte            *bool    `json:",omitempty"`
 	Malloc_not_svelte_libc32     *bool    `json:",omitempty"`
 	Malloc_zero_contents         *bool    `json:",omitempty"`
@@ -329,6 +320,8 @@ type ProductVariables struct {
 	CFIExcludePaths []string `json:",omitempty"`
 	CFIIncludePaths []string `json:",omitempty"`
 
+	DisableScudo *bool `json:",omitempty"`
+
 	MemtagHeapExcludePaths      []string `json:",omitempty"`
 	MemtagHeapAsyncIncludePaths []string `json:",omitempty"`
 	MemtagHeapSyncIncludePaths  []string `json:",omitempty"`
@@ -623,7 +616,6 @@ func (v *ProductVariables) SetDefaultConfig() {
 		AAPTCharacteristics: stringPtr("nosdcard"),
 		AAPTPrebuiltDPI:     []string{"xhdpi", "xxhdpi"},
 
-		Malloc_use_scudo:             boolPtr(false),
 		Malloc_not_svelte:            boolPtr(true),
 		Malloc_not_svelte_libc32:     boolPtr(true),
 		Malloc_zero_contents:         boolPtr(true),