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

Commit 98cae973 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by android-build-merger
Browse files

Merge "Export HWASAN_OPTIONS when SANITIZE_TARGET:=hwaddress" am: b3bc8427 am: 44ab3697 

am: 553d28c6

Change-Id: I36fc25e2b484e13d455c66a63c5e826022ce1ff1
parents c5ef70dc 553d28c6

rootdir/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -67,6 +67,13 @@ ifneq ($(filter address,$(SANITIZE_TARGET)),) 
  LOCAL_REQUIRED_MODULES := asan.options $(ASAN_OPTIONS_FILES) $(ASAN_EXTRACT_FILES)

endif



EXPORT_GLOBAL_HWASAN_OPTIONS :=

ifneq ($(filter hwaddress,$(SANITIZE_TARGET)),)

  ifneq ($(HWADDRESS_SANITIZER_GLOBAL_OPTIONS),)

    EXPORT_GLOBAL_HWASAN_OPTIONS := export HWASAN_OPTIONS $(HWADDRESS_SANITIZER_GLOBAL_OPTIONS)

  endif

endif



EXPORT_GLOBAL_GCOV_OPTIONS :=

ifeq ($(NATIVE_COVERAGE),true)

  EXPORT_GLOBAL_GCOV_OPTIONS := export GCOV_PREFIX /data/misc/gcov
@@ -151,6 +158,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep) 
	$(hide) sed -i -e 's?%SYSTEMSERVERCLASSPATH%?$(PRODUCT_SYSTEM_SERVER_CLASSPATH)?g' $@

	$(hide) sed -i -e 's?%EXPORT_GLOBAL_ASAN_OPTIONS%?$(EXPORT_GLOBAL_ASAN_OPTIONS)?g' $@

	$(hide) sed -i -e 's?%EXPORT_GLOBAL_GCOV_OPTIONS%?$(EXPORT_GLOBAL_GCOV_OPTIONS)?g' $@

	$(hide) sed -i -e 's?%EXPORT_GLOBAL_HWASAN_OPTIONS%?$(EXPORT_GLOBAL_HWASAN_OPTIONS)?g' $@



bcp_md5 :=

bcp_dep :=

rootdir/init.environ.rc.in

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ on init 
    export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH%

    %EXPORT_GLOBAL_ASAN_OPTIONS%

    %EXPORT_GLOBAL_GCOV_OPTIONS%

    %EXPORT_GLOBAL_HWASAN_OPTIONS%