Merge "Copy the bionic -fstack-protector hack into libbacktrace."

2014-01-15 00:46:48 +00:00 · 2014-01-15 00:46:48 +00:00 · 3352c50375
parent 21ecc30cd0 1380ddcab2
commit 3352c50375
1 changed files with 5 additions and 0 deletions
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@ -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) \