diff options
| author | Christopher Ferris <cferris@google.com> | 2014-04-18 15:30:15 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-04-21 17:57:56 -0700 |
| commit | 04fd4389fb2cd92e50d725e1edbf5538aafc414b (patch) | |
| tree | 9bede8401d6c78c1203709682cf6af2a58135c5b /libbacktrace | |
| parent | 958235bdc1d9d421cff24a8af415959ec5282c46 (diff) | |
| download | system_core-04fd4389fb2cd92e50d725e1edbf5538aafc414b.zip system_core-04fd4389fb2cd92e50d725e1edbf5538aafc414b.tar.gz system_core-04fd4389fb2cd92e50d725e1edbf5538aafc414b.tar.bz2 | |
Remove the arm64 special case.
The stack-protector option is handled by the global makefiles.
Change-Id: I99c4a1624e72ad91ac10eef27c0e3758fe9af8ba
Diffstat (limited to 'libbacktrace')
| -rwxr-xr-x | libbacktrace/Android.mk | 8 |
1 files changed, 1 insertions, 7 deletions
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 @@ 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 \ |