diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-15 00:46:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-15 00:46:48 +0000 |
| commit | 3352c5037526e1f5cd3291a4853c497e488b824c (patch) | |
| tree | 0be8ad57efeb8ad8fcc786234c9d3302c751dcd2 | |
| parent | 21ecc30cd0bb0eb5035d48e4eb0e78d6a509dd8d (diff) | |
| parent | 1380ddcab2f67573cd5839b51499217d7e58acd7 (diff) | |
| download | system_core-3352c5037526e1f5cd3291a4853c497e488b824c.zip system_core-3352c5037526e1f5cd3291a4853c497e488b824c.tar.gz system_core-3352c5037526e1f5cd3291a4853c497e488b824c.tar.bz2 | |
Merge "Copy the bionic -fstack-protector hack into libbacktrace."
| -rw-r--r-- | libbacktrace/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 8995fc1..d2fd79e 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -148,6 +148,11 @@ LOCAL_CFLAGS += \ -DGTEST_OS_LINUX_ANDROID \ -DGTEST_HAS_STD_STRING \ +ifeq ($(TARGET_ARCH),aarch64) + $(info TODO: $(LOCAL_PATH)/Android.mk -fstack-protector not yet available for the AArch64 toolchain) + LOCAL_CFLAGS += -fno-stack-protector +endif # aarch64 + LOCAL_CONLYFLAGS += \ $(common_conlyflags) \ |