commit 1a9dd1c7def9c01c41d9e53c42916e60c3fab89e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 01 02:52:38 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 01 02:52:38 2023 +0000
tree 1990240af0c762fc4ba012ab41698fa19ff034a3
parent 45db0e0c176b5a80df2820faca26564b361b65a7
parent beb5bed41f0b7ebd62014bed2e26c2d3b309a022

Merge "Increase scudo MTE buffer for fullmte devices" into main

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index 969b506..91b811d 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -447,6 +447,7 @@
 _product_list_vars += PRODUCT_AFDO_PROFILES
 
 _product_single_value_vars += PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API
+_product_single_value_vars += PRODUCT_SCUDO_ALLOCATION_RING_BUFFER_SIZE
 
 _product_list_vars += PRODUCT_RELEASE_CONFIG_MAPS
 

target/product/fullmte.mk

diff --git a/target/product/fullmte.mk b/target/product/fullmte.mk
index 5726c06..5e2a694 100644
--- a/target/product/fullmte.mk
+++ b/target/product/fullmte.mk
@@ -25,3 +25,4 @@
   SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap)
 endif
 PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync
+PRODUCT_SCUDO_ALLOCATION_RING_BUFFER_SIZE := 131072