Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a8996fb authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '3352c503':
  Copy the bionic -fstack-protector hack into libbacktrace.
parents ea8dcdcf 3352c503
Loading
Loading
Loading
Loading
+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) \