diff --git a/rootdir/Android.mk b/rootdir/Android.mk index cc6b64a3f..7deb17324 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -72,6 +72,11 @@ ifneq ($(filter hwaddress,$(SANITIZE_TARGET)),) endif endif +EXPORT_GLOBAL_SCUDO_ALLOCATION_RING_BUFFER_SIZE := +ifneq ($(PRODUCT_SCUDO_ALLOCATION_RING_BUFFER_SIZE),) + EXPORT_GLOBAL_SCUDO_ALLOCATION_RING_BUFFER_SIZE := export SCUDO_ALLOCATION_RING_BUFFER_SIZE $(PRODUCT_SCUDO_ALLOCATION_RING_BUFFER_SIZE) +endif + EXPORT_GLOBAL_GCOV_OPTIONS := ifeq ($(NATIVE_COVERAGE),true) EXPORT_GLOBAL_GCOV_OPTIONS := export GCOV_PREFIX /data/misc/trace @@ -216,6 +221,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(hide) sed -i -e 's?%EXPORT_GLOBAL_GCOV_OPTIONS%?$(EXPORT_GLOBAL_GCOV_OPTIONS)?g' $@ $(hide) sed -i -e 's?%EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS%?$(EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS)?g' $@ $(hide) sed -i -e 's?%EXPORT_GLOBAL_HWASAN_OPTIONS%?$(EXPORT_GLOBAL_HWASAN_OPTIONS)?g' $@ + $(hide) sed -i -e 's?%EXPORT_GLOBAL_SCUDO_ALLOCATION_RING_BUFFER_SIZE%?$(EXPORT_GLOBAL_SCUDO_ALLOCATION_RING_BUFFER_SIZE)?g' $@ # Append PLATFORM_VNDK_VERSION to base name. define append_vndk_version diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in index bf6e986c4..7ba1f46e7 100644 --- a/rootdir/init.environ.rc.in +++ b/rootdir/init.environ.rc.in @@ -14,3 +14,4 @@ on early-init %EXPORT_GLOBAL_GCOV_OPTIONS% %EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS% %EXPORT_GLOBAL_HWASAN_OPTIONS% + %EXPORT_GLOBAL_SCUDO_ALLOCATION_RING_BUFFER_SIZE%