commit e87dab14ee2914308b96488c8a2b1d22a25473aa
author Christopher Ferris <cferris@google.com> Tue Apr 22 13:18:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 22 13:18:57 2014 +0000
tree 5b74ec93816fa33c53ddc321c82a33d63503a52a
parent afe5bbefac2cd09a2a2e46777f6bba7afa9c2966
parent 07fa043341ad057ea79ca973089609965ba6c4f9

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

* commit '07fa043341ad057ea79ca973089609965ba6c4f9':
  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 \