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

* commit '3af88bc6377f50904ad3172b06f76d95ceda9cda': Remove the arm64 special case.
2014-04-22 13:37:44 +00:00 · 2014-04-22 13:37:44 +00:00 · 04c5192ff5
parent 564244cd38 3af88bc637
commit 04c5192ff5
1 changed files with 1 additions and 7 deletions
--- 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 \