commit 0607e104c2db2a3e115fd9b49ea85cbc03dbcd1f
author Mark Salyzyn <salyzyn@google.com> Tue Apr 22 19:15:00 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 22 19:15:00 2014 +0000
tree 2eccab84152178dc83860e42b67e5b924f9f6635
parent 07fa043341ad057ea79ca973089609965ba6c4f9
parent 696817d3524e2fb8bbbcc2ec3526f4383f789163

Merge "liblog: Statistics truncated to 16384 bytes"

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index c743077..fdcb162 100755
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -119,13 +119,7 @@
 	-O0 \
 	-g \
 	-DGTEST_HAS_STD_STRING \
-
-ifneq ($(TARGET_ARCH),arm64)
-backtrace_test_cflags += -fstack-protector-all
-else
-  $(info TODO: $(LOCAL_PATH)/Android.mk -fstack-protector not yet available for the AArch64 toolchain)
-  common_cflags += -fno-stack-protector
-endif # arm64
+	-fstack-protector-all \
 
 backtrace_test_cflags_target := \
 	-DGTEST_OS_LINUX_ANDROID \