From 04fd4389fb2cd92e50d725e1edbf5538aafc414b Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Fri, 18 Apr 2014 15:30:15 -0700
Subject: [PATCH] Remove the arm64 special case.

The stack-protector option is handled by the global makefiles.

Change-Id: I99c4a1624e72ad91ac10eef27c0e3758fe9af8ba
---
 libbacktrace/Android.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index c743077e6..fdcb1629f 100755
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -119,13 +119,7 @@ backtrace_test_cflags := \
 	-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 \