summaryrefslogtreecommitdiffstats
path: root/libbacktrace
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-01-14 16:44:31 -0800
committerElliott Hughes <enh@google.com>2014-01-14 16:44:31 -0800
commit1380ddcab2f67573cd5839b51499217d7e58acd7 (patch)
tree0be8ad57efeb8ad8fcc786234c9d3302c751dcd2 /libbacktrace
parent21ecc30cd0bb0eb5035d48e4eb0e78d6a509dd8d (diff)
downloadsystem_core-1380ddcab2f67573cd5839b51499217d7e58acd7.tar.gz
system_core-1380ddcab2f67573cd5839b51499217d7e58acd7.tar.bz2
system_core-1380ddcab2f67573cd5839b51499217d7e58acd7.zip
Copy the bionic -fstack-protector hack into libbacktrace.
aarch64 doesn't support -fstack-protector yet. Change-Id: Id1e589742ba074f59d3390d059248c9b371aff58
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 8995fc17f..d2fd79e76 100644
--- 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) \