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

* commit '42e82f80fef7b1f13c9c3ab184cea065f4f4edbc': Copy the bionic -fstack-protector hack into libbacktrace.
2014-01-15 00:57:41 +00:00 · 2014-01-15 00:57:41 +00:00 · 7dee721eb3
parent b6e70fce53 42e82f80fe
commit 7dee721eb3
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) \