am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '3352c5037526e1f5cd3291a4853c497e488b824c':
  Copy the bionic -fstack-protector hack into libbacktrace.
This commit is contained in:
Elliott Hughes 2014-01-14 16:52:33 -08:00 committed by Android Git Automerger
commit 4a8996fb42

View file

@ -148,6 +148,11 @@ LOCAL_CFLAGS += \
-DGTEST_OS_LINUX_ANDROID \
-DGTEST_HAS_STD_STRING \
ifeq ($(TARGET_ARCH),aarch64)
$(info TODO: $(LOCAL_PATH)/Android.mk -fstack-protector not yet available for the AArch64 toolchain)
LOCAL_CFLAGS += -fno-stack-protector
endif # aarch64
LOCAL_CONLYFLAGS += \
$(common_conlyflags) \