Merge \"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\"

am: 997a6cd1a1

Change-Id: Ic8bc436901efd0b8ba099d68b61faa46a8d503fd
This commit is contained in:
Evgenii Stepanov
2016-07-01 20:22:41 +00:00
committed by android-build-merger

View File

@@ -75,6 +75,12 @@ ifneq ($(filter thread,$(my_sanitize)),)
endif
endif
ifneq ($(filter safe-stack,$(my_sanitize)),)
ifeq ($(my_32_64_bit_suffix),32)
my_sanitize := $(filter-out safe-stack,$(my_sanitize))
endif
endif
# Undefined symbols can occur if a non-sanitized library links
# sanitized static libraries. That's OK, because the executable
# always depends on the ASan runtime library, which defines these