Merge "Enable SANITIZE_TARGET." (d479a7a1) · Commits · e / os / android_build

core/config_sanitizers.mk

+15 −13

Original line number	Diff line number	Diff line
		@@ -9,12 +9,15 @@ ifdef LOCAL_SDK_VERSION
		my_sanitize := never
		endif

		# Configure SANITIZE_HOST.
		ifdef LOCAL_IS_HOST_MODULE
		# Configure SANITIZE_HOST / SANITIZE_TARGET.
		ifeq ($(my_sanitize),)
		ifdef LOCAL_IS_HOST_MODULE
		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)
		my_sanitize := address
		endif
		@@ -26,7 +29,6 @@ ifdef LOCAL_IS_HOST_MODULE
		my_sanitize :=
		endif
		endif
		endif

		ifeq ($(my_sanitize),never)
		my_sanitize :=

+13 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,17 @@
		# LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 or LOCAL_MODULE_STEM_32 and
		# 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_
		include $(BUILD_SYSTEM)/multilib.mk

		@@ -71,3 +82,5 @@ LOCAL_2ND_ARCH_VAR_PREFIX :=
		LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=

		my_module_arch_supported :=

		endif