ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Read global ASAN_OPTIONS from a file."

Browse source
This commit is contained in:
Evgenii Stepanov 2015-08-16 18:42:38 +00:00 • committed by Gerrit Code Review
commit 428f626d1b
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
rootdir/Android.mk
View file

@ -13,6 +13,20 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
endif endif
#######################################
# asan.options
ifeq (address,$(strip $(SANITIZE_TARGET)))
include $(CLEAR_VARS)
LOCAL_MODULE := asan.options
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_OUT)
include $(BUILD_PREBUILT)
endif
####################################### #######################################
# init.environ.rc # init.environ.rc
@ -21,6 +35,11 @@ LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE := init.environ.rc LOCAL_MODULE := init.environ.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
EXPORT_GLOBAL_ASAN_OPTIONS :=
ifeq (address,$(strip $(SANITIZE_TARGET)))
EXPORT_GLOBAL_ASAN_OPTIONS := export ASAN_OPTIONS include=/system/asan.options
LOCAL_REQUIRED_MODULES := asan.options
endif
# Put it here instead of in init.rc module definition, # Put it here instead of in init.rc module definition,
# because init.rc is conditionally included. # because init.rc is conditionally included.
# #
@ -39,11 +58,6 @@ local_post_install_cmd_base :=
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
EXPORT_GLOBAL_ASAN_OPTIONS :=
ifeq (address,$(strip $(SANITIZE_TARGET)))
EXPORT_GLOBAL_ASAN_OPTIONS := export ASAN_OPTIONS allow_user_segv_handler=1:detect_odr_violation=0:alloc_dealloc_mismatch=0
endif
# Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH has changed. # Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH has changed.
bcp_md5 := $(word 1, $(shell echo $(PRODUCT_BOOTCLASSPATH) $(PRODUCT_SYSTEM_SERVER_CLASSPATH) | $(MD5SUM))) bcp_md5 := $(word 1, $(shell echo $(PRODUCT_BOOTCLASSPATH) $(PRODUCT_SYSTEM_SERVER_CLASSPATH) | $(MD5SUM)))
bcp_dep := $(intermediates)/$(bcp_md5).bcp.dep bcp_dep := $(intermediates)/$(bcp_md5).bcp.dep

1
rootdir/asan.options Normal file
View file

@ -0,0 +1 @@
allow_user_segv_handler=1:detect_odr_violation=0:alloc_dealloc_mismatch=0:allocator_may_return_null=1