aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Homescu <ahomescu@google.com>2024-02-16 05:15:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-16 05:15:34 +0000
commit686cce752cd627618db6c4daf2512c882e7b2837 (patch)
treedb15217a5d51dfa8f4ff76247754a9c5d027644e
parentb63969fab57accc272cb718d837978d904322e44 (diff)
parentaecd32909748689327b191101dfa7f74b204041b (diff)
downloadstorage-686cce752cd627618db6c4daf2512c882e7b2837.tar.gz
scudo: Set the ring buffer size using SCUDO_DEFAULT_OPTIONS am: aecd329097
Original change: https://android-review.googlesource.com/c/trusty/app/storage/+/2849068 Change-Id: Ie2c0f33fb2354f5211580e07068d4d91f247158d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--scudo/rules.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/scudo/rules.mk b/scudo/rules.mk
index 62fb666..21271f9 100644
--- a/scudo/rules.mk
+++ b/scudo/rules.mk
@@ -39,6 +39,12 @@ MODULE_CPPFLAGS += \
-fno-exceptions \
-nostdinc++ \
+# Set the default options to Trusty-specific values:
+# - allocation_ring_buffer_size=0
+# Limit the ring buffer size to 0 on Trusty (see aosp/2395872)
+MODULE_COMPILEFLAGS += \
+ -DSCUDO_DEFAULT_OPTIONS="allocation_ring_buffer_size=0"
+
# scudo should be freestanding, but the rest of the app should not be.
MODULE_COMPILEFLAGS += -ffreestanding