Commit ef539174 authored Jan 15, 2014 by Elliott Hughes Committed by Android Git Automerger Jan 15, 2014

am 7dee721e: am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic...

am 7dee721e: am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '7dee721e':
  Copy the bionic -fstack-protector hack into libbacktrace.

parents 57a6fbfb 7dee721e

libbacktrace/Android.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -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) \