diff options
| author | Colin Cross <ccross@android.com> | 2014-01-24 21:24:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-24 21:24:52 +0000 |
| commit | 892af2303f4d7ca628bdd538fc372fc06b26228f (patch) | |
| tree | 84b022aefe851fb8001c98f47c8c42f3e89a1657 /libbacktrace | |
| parent | 9c34e9646d081d4174a2df801ccf94b9678539b5 (diff) | |
| parent | 9222d911a89d30a9b0537e8cdb95401be3a4999e (diff) | |
| download | system_core-892af2303f4d7ca628bdd538fc372fc06b26228f.zip system_core-892af2303f4d7ca628bdd538fc372fc06b26228f.tar.gz system_core-892af2303f4d7ca628bdd538fc372fc06b26228f.tar.bz2 | |
am 9222d911: am c8518616: am 02f68c4b: am 4800e20e: Merge "system/core: rename aarch64 target to arm64"
* commit '9222d911a89d30a9b0537e8cdb95401be3a4999e':
system/core: rename aarch64 target to arm64
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index d729c1c..9c52ad7 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -148,10 +148,10 @@ LOCAL_CFLAGS += \ -DGTEST_OS_LINUX_ANDROID \ -DGTEST_HAS_STD_STRING \ -ifeq ($(TARGET_ARCH),aarch64) +ifeq ($(TARGET_ARCH),arm64) $(info TODO: $(LOCAL_PATH)/Android.mk -fstack-protector not yet available for the AArch64 toolchain) LOCAL_CFLAGS += -fno-stack-protector -endif # aarch64 +endif # arm64 LOCAL_CONLYFLAGS += \ $(common_conlyflags) \ |