commit 7dee721eb3387fff695e5b5a3480428bccb3cf70
author Elliott Hughes <enh@google.com> Wed Jan 15 00:57:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 15 00:57:41 2014 +0000
tree e22e2c237a7e6b1edc0c4b7f803d817017798ed3
parent b6e70fce5365c596a7b0b22cd3ba75c5d7ef6430
parent 42e82f80fef7b1f13c9c3ab184cea065f4f4edbc

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.

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 8995fc1..d2fd79e 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -148,6 +148,11 @@
 	-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) \