From 38bf7ca6690776836d42ad01aa91b85e6cae8093 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 15 May 2024 03:45:04 -0400 Subject: [PATCH] Revert "raise class region size to 32GB for arm64 Android" This reverts commit b5dd9d11d9fd404d845025c35e8f086cc6e8d288. --- Android.bp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 0db6a04..dabcb9c 100644 --- a/Android.bp +++ b/Android.bp @@ -26,7 +26,6 @@ common_cflags = [ "-DREGION_QUARANTINE_QUEUE_LENGTH=1024", "-DREGION_QUARANTINE_SKIP_THRESHOLD=33554432", // 32MiB "-DFREE_SLABS_QUARANTINE_RANDOM_LENGTH=32", - "-DCONFIG_CLASS_REGION_SIZE=34359738368", // 32GiB "-DN_ARENA=1", "-DCONFIG_STATS=true", "-DCONFIG_SELF_INIT=false", @@ -36,6 +35,14 @@ cc_defaults { name: "hardened_malloc_defaults", defaults: ["linux_bionic_supported"], cflags: common_cflags, + arch: { + arm64: { + cflags: ["-DCONFIG_CLASS_REGION_SIZE=2147483648"] // 2GiB + }, + x86_64: { + cflags: ["-DCONFIG_CLASS_REGION_SIZE=34359738368"] // 32GiB + }, + }, conlyflags: ["-std=c17", "-Wmissing-prototypes"], stl: "none", }