diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-15 01:00:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 01:00:47 +0000 |
| commit | ef53917406e90bc7620e036083e4d50b5cbb201e (patch) | |
| tree | 3c607bede48917dd11346fc9f4df71cea19dcf3e | |
| parent | 57a6fbfb9a6b662a9ac9bfa8bf500512340b2541 (diff) | |
| parent | 7dee721eb3387fff695e5b5a3480428bccb3cf70 (diff) | |
| download | system_core-ef53917406e90bc7620e036083e4d50b5cbb201e.zip system_core-ef53917406e90bc7620e036083e4d50b5cbb201e.tar.gz system_core-ef53917406e90bc7620e036083e4d50b5cbb201e.tar.bz2 | |
am 7dee721e: am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."
* commit '7dee721eb3387fff695e5b5a3480428bccb3cf70':
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) \ |