diff options
| author | Colin Cross <ccross@android.com> | 2014-01-24 20:32:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-24 20:32:49 +0000 |
| commit | 4800e20eafacabe76e56183aa82797ac5c4057c1 (patch) | |
| tree | cb765483923155745500960c5144708ebf91993e /libbacktrace | |
| parent | 794b587b37e3f32c081e5fdc084581be9d68292d (diff) | |
| parent | d4146e6091d6ed947ce9edd0f8ef3e5fe066d716 (diff) | |
| download | system_core-4800e20eafacabe76e56183aa82797ac5c4057c1.zip system_core-4800e20eafacabe76e56183aa82797ac5c4057c1.tar.gz system_core-4800e20eafacabe76e56183aa82797ac5c4057c1.tar.bz2 | |
Merge "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) \ |