commit 3af88bc6377f50904ad3172b06f76d95ceda9cda
author Christopher Ferris <cferris@google.com> Tue Apr 22 13:32:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 22 13:32:02 2014 +0000
tree 0d8a9dbd133ce4739178ca271399941572cca6e2
parent 0888e52fa8141acdcf62eff1b14059d9aab17382
parent e87dab14ee2914308b96488c8a2b1d22a25473aa

am e87dab14: am 07fa0433: Merge "Remove the arm64 special case."

* commit 'e87dab14ee2914308b96488c8a2b1d22a25473aa':
  Remove the arm64 special case.

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 \