StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable SANITIZE_TARGET."

Browse Source
This commit is contained in:
Evgenii Stepanov
2015-06-19 18:15:07 +00:00
committed by Gerrit Code Review
parent 4fbb83dd3b 3632cc3241
commit d479a7a119
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/config_sanitizers.mk
View File

@@ -9,12 +9,15 @@ ifdef LOCAL_SDK_VERSION
my_sanitize := never my_sanitize := never
endif endif
# Configure SANITIZE_HOST. # Configure SANITIZE_HOST / SANITIZE_TARGET.
ifdef LOCAL_IS_HOST_MODULE ifeq ($(my_sanitize),)
ifeq ($(my_sanitize),) ifdef LOCAL_IS_HOST_MODULE
my_sanitize := $(strip $(SANITIZE_HOST)) my_sanitize := $(strip $(SANITIZE_HOST))
else
my_sanitize := $(strip $(SANITIZE_TARGET))
endif
# SANTIZIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address. # SANITIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address.
ifeq ($(my_sanitize),true) ifeq ($(my_sanitize),true)
my_sanitize := address my_sanitize := address
endif endif
@@ -25,7 +28,6 @@ ifdef LOCAL_IS_HOST_MODULE
ifneq ($(my_clang),true) ifneq ($(my_clang),true)
my_sanitize := my_sanitize :=
endif endif
endif
endif endif
ifeq ($(my_sanitize),never) ifeq ($(my_sanitize),never)

13
core/executable.mk
View File

@@ -6,6 +6,17 @@
# LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 or LOCAL_MODULE_STEM_32 and # LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 or LOCAL_MODULE_STEM_32 and
# LOCAL_MODULE_STEM_64 # LOCAL_MODULE_STEM_64
my_skip_this_target :=
ifeq (address,$(strip $(SANITIZE_TARGET)))
ifeq (true,$(LOCAL_FORCE_STATIC_EXECUTABLE))
my_skip_this_target := true
else ifeq (false, $(LOCAL_CLANG))
my_skip_this_target := true
endif
endif
ifneq (true,$(my_skip_this_target))
my_prefix := TARGET_ my_prefix := TARGET_
include $(BUILD_SYSTEM)/multilib.mk include $(BUILD_SYSTEM)/multilib.mk
@@ -71,3 +82,5 @@ LOCAL_2ND_ARCH_VAR_PREFIX :=
LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=
my_module_arch_supported := my_module_arch_supported :=
endif