Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdf660b8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow to set scudo allocation buffer size" into main am: 56f7436a am:... 

Merge "Allow to set scudo allocation buffer size" into main am: 56f7436a am: 54ec1051 am: 84ee1bd6

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2822611



Change-Id: Iddfda07d592b2f982dbd1028027080bec38de2d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79d303ce 84ee1bd6

rootdir/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -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

rootdir/init.environ.rc.in

+1 −0
Original line number Diff line number Diff line
@@ -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%